Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r763378f5f19a0842295daae24aaf28f801e823b7 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r763378f5f19a0842295daae24aaf28f801e823b7 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -rf65686830c50dda1e327b1169889198c57044815 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision f65686830c50dda1e327b1169889198c57044815)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision fc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8)
@@ -450,7 +450,8 @@
 		}
 		else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){
 			//get the children
-			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
+			var children:Array = cm.ddm.getComplexActivityChildren(a.activityUIID);
+			Debugger.log("children.length: " + children.length, Debugger.CRITICAL, "drawActivity", "CanvasBranchView");
 			
 			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly()})
 															: activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv, _locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc});
@@ -459,7 +460,8 @@
 			Debugger.log('Parallel activity a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView');
 		}
 		else if(a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE){
-			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
+			var children:Array = cm.ddm.getComplexActivityChildren(a.activityUIID);
+			Debugger.log("children.length: " + children.length, Debugger.CRITICAL, "drawActivity", "CanvasBranchView");
 			
 			var newActivity_mc = (_module != "monitoring") ? activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _canvasController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly()})
 															: activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children, _monitorController:cbc,_canvasBranchView:cbv,_locked:a.isReadOnly(), fromModuleTab:fromModuleTab, learnerContainer:_learnerContainer_mc});
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as
===================================================================
diff -u -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as	(.../CanvasOptionalActivity.as)	(revision fc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8)
@@ -201,7 +201,8 @@
 			
 			if(_children[i].isSequenceActivity()) {
 				if(fromModuleTab == "monitorMonitorTab") {
-					children_mc[i] = childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
+					children_mc[i] = (_canvasBranchView != null) ? childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer})
+																	: childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
 				} else {
 					children_mc[i] = (_canvasBranchView != null) ? childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _canvasController:_canvasController, _canvasBranchView:_canvasBranchView})
 																	: childActivities_mc.attachMovie("CanvasSequenceActivity", "CanvasSequenceActivity"+i, childActivities_mc.getNextHighestDepth(), {_activity:_children[i] , _canvasController:_canvasController, _canvasView:_canvasView});
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
diff -u -rc68ac7f224a0b5f97eabab04023ce40ffb4444b4 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision c68ac7f224a0b5f97eabab04023ce40ffb4444b4)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	(.../CanvasSequenceActivity.as)	(revision fc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8)
@@ -54,6 +54,7 @@
 	//this is set by the init object
 	private var _canvasController:CanvasController;
 	private var _canvasView:CanvasView;
+	
 	private var _canvasBranchView:CanvasBranchView;
 	
 	private var _monitorController:MonitorController;
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
diff -u -rf65686830c50dda1e327b1169889198c57044815 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
diff -u -rf65686830c50dda1e327b1169889198c57044815 -rfc4c4a55d4ffd1fbdc9cb96b2a879c683cc9a5e8
Binary files differ