Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as,v
diff -u -r1.92 -r1.93
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	21 Oct 2008 03:08:59 -0000	1.92
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	3 Nov 2008 02:07:28 -0000	1.93
@@ -576,9 +576,8 @@
 		}
 		else if(a.isBranchingActivity()) {	
 			BranchingActivity(a).clear = activity.clear;
-			
 			var newActivity_mc = (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a, _canvasController:cbc,_canvasBranchView:cbv, showDiagram: true})
-															: activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc,_canvasBranchView:cbv, _module:_module, learnerContainer:_learnerContainer_mc});
+															: activityLayer.createChildAtDepth("CanvasBranchingActivity",DepthManager.kTop,{_activity:a, _monitorController:cbc,_canvasBranchView:cbv, _module:_module, learnerContainer:_learnerContainer_mc, showDiagram: true});
 															
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 			Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasBranchView');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as,v
diff -u -r1.52 -r1.53
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	27 Oct 2008 06:05:09 -0000	1.52
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	3 Nov 2008 02:07:28 -0000	1.53
@@ -209,10 +209,10 @@
 			_isSelected = false;
 			refresh();
 		}
-		
-		if(!_activity.isGateActivity() && !_activity.isGroupActivity() && !_activity.isBranchingActivity() || _branchConnector){
+
+		if (!_activity.isGateActivity() && !_activity.isGroupActivity() && !_activity.isBranchingActivity() || _branchConnector) {
 			loadIcon();
-		} else if(_activity.isBranchingActivity() && showDiagram) {
+		} else if (_activity.isBranchingActivity() && showDiagram) {
 			loadDiagram();
 		}
 		
@@ -313,15 +313,15 @@
 	}
 	
 	private function loadDiagram():Void {
-		diagram_mc = CanvasBranchingDiagram(this.attachMovie("CanvasBranchingDiagram", "diagram_mc", this.getNextHighestDepth(), {_ddm: getDDM(), _branchingActivity: activity, _visible: false}));
+		diagram_mc = CanvasBranchingDiagram(this.attachMovie("CanvasBranchingDiagram", "diagram_mc", this.getNextHighestDepth(), {_ddm: getDDM(), _branchingActivity: _activity, _visible: false}));
 
 		// swap depths if transparent layer visible
 		if(fade_mc._visible) {
 			diagram_mc.swapDepths(fade_mc);
 		}
 	}
 	
-	private function loadIcon():Void{
+	private function loadIcon():Void {
 		icon_mc = this.createEmptyMovieClip("icon_mc", this.getNextHighestDepth());
 		var ml = new MovieLoader(Config.getInstance().serverUrl+_activity.libraryActivityUIImage,setUpActIcon,this,icon_mc);	
 
@@ -858,12 +858,12 @@
 	public function get actChildren():Array {
 		return getDDM().getComplexActivityChildren(activity.activityUIID)
 	}
-	
+		
 	private function getDDM():DesignDataModel {
-		if(_module == "monitoring") {
-			return _monitorView.ddm;
-		} else if(_canvasBranchView != null){
+		if (_canvasBranchView != null) {
 			return _canvasBranchView.ddm;
+		} else if (_module == "monitoring") {
+			return _monitorView.ddm;
 		} else {
 			return _canvasView.ddm;
 		}
Index: lams_monitoring/web/lams_monitoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring.swf,v
diff -u -r1.219 -r1.220
Binary files differ
Index: lams_monitoring/web/lams_monitoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/lams_monitoring_library.swf,v
diff -u -r1.187 -r1.188
Binary files differ