Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	26 Oct 2007 09:35:25 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	18 Dec 2007 02:22:15 -0000	1.5
@@ -258,10 +258,10 @@
 		} else if(a.isGateActivity()){
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerGateActivity", "LearnerGateActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
-		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE ||  (a.isBranchingActivity() && _root.mode == 'preview')){
+		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE || (a.isBranchingActivity() && _root.mode == 'preview')){
 			//get the children
 			var children:Array = lm.learningDesignModel.getComplexActivityChildren(a.activityUIID);
-			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is is parellel (complex) activity',Debugger.CRITICAL,'drawActivity','LessonView');
+			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is is complex (parallel, optional, branching) activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerComplexActivity", "LearnerComplexActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, learner:lm.progressData});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	18 Dec 2007 01:51:36 -0000	1.6
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	18 Dec 2007 02:22:15 -0000	1.7
@@ -45,7 +45,6 @@
 */
 class LearnerComplexActivity extends MovieClip implements ICanvasActivity
 {
-	//class org.lamsfoundation.lams.authoring.cv.CanvasParallelActivity extends MovieClip {
 	private var CHILD_OFFSET_X : Number = 8;
 	private var CHILD_OFFSET_Y : Number = 57;
 	private var CHILD_INCRE : Number = 60;
Index: lams_learning/web/lams_learner.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/Attic/lams_learner.swf,v
diff -u -r1.72 -r1.73
Binary files differ