Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.461 -r1.462
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.361 -r1.362
Binary files differ
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.90 -r1.91
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	27 Jun 2008 05:15:30 -0000	1.90
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	1 Jul 2008 04:41:11 -0000	1.91
@@ -242,13 +242,8 @@
 				drawAll(event.data, _model);
 				break;
 			case 'SET_ACTIVE':
-				Debugger.log('setting activie :' + event.updateType + " event.data: " + event.data.activity.activityUIID + " condition: " + (event.data.activity.activityUIID == this.activity.activityUIID),Debugger.CRITICAL,'update','org.lamsfoundation.lams.CanvasBranchView');
-				Debugger.log('this object :' + this.activity.activityUIID,Debugger.CRITICAL,'update','org.lamsfoundation.lams.CanvasBranchView');
-				
 				transparentCover._visible = (event.data == this) ? false : true;
 				
-				Debugger.log("is open: " + _isOpen, Debugger.CRITICAL, "viewUpdate", "CanvasBranchView");
-				
 				if(event.data.activity.activityUIID == this.activity.activityUIID) {
 					_eventsEnabled = true;
 					
@@ -358,23 +353,15 @@
 	
 	private function hitConnectorHubs() {
 		delete this.onEnterFrame;
-		
 		startHub.hit();
 		endHub.hit();
-		
-		Debugger.log('start x:' + this.activity.startXCoord, Debugger.CRITICAL,' hitConnectorHubs','CanvasBranchView');
-		
 	}
 	
 	private function loadSequenceActivities() {
 		var sequenceActs:Array = (model instanceof CanvasModel) ? _cm.getCanvas().ddm.getComplexActivityChildren(activity.activityUIID) : _mm.getMonitor().ddm.getComplexActivityChildren(activity.activityUIID);
-		Debugger.log("Sequence Activities length: " + sequenceActs.length, Debugger.CRITICAL, "loadSequenceActivities", "CanvasBranchView");
-		
 		model.haltRefresh(true);
 		
 		for(var i=0; i<sequenceActs.length;  i++) {
-			Debugger.log('firstActivityUIID:' + activity.firstActivityUIID, Debugger.CRITICAL, "loadSequenceActivities", "CanvasBranchView");
-			
 			if(SequenceActivity(sequenceActs[i]).activityUIID == activity.firstActivityUIID) {
 				// (monitoring) entering this if statement
 				model.addNewBranch(SequenceActivity(sequenceActs[i]), activity, true);
@@ -881,22 +868,13 @@
     * @param cm Canvas model object 
     */
 	private function setPosition(model, cx, cy){
-		Debugger.log("model: " + model.activitiesDisplayed, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
-		Debugger.log("act UIID: " + activity.activityUIID, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
-		
 		if(cx != null && cy != null) {
 			_x = cx;
 			_y = cy;
 			
-			if(_isBranchChild) 
-				Debugger.log("bc cx: " + cx + " // bc cy: " + cy, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
-			
 			var hPosition:Number = (model instanceof CanvasModel) ? model.getCanvas().view.getScrollPaneHPosition() : model.getMonitor().getMV().getMonitorSequenceScp().hPosition;
 			var vPosition:Number = (model instanceof CanvasModel) ? model.getCanvas().view.getScrollPaneVPosition() : model.getMonitor().getMV().getMonitorSequenceScp().vPosition;
 			
-			Debugger.log(" hPosition: " +  hPosition, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
-			Debugger.log(" vPosition: " +  vPosition, Debugger.CRITICAL, "setPosition", "CanvasBranchView");
-		
 			canvas_scp._x = (_isBranchChild) ? -cx : -cx + hSpace + hPosition;
 			canvas_scp._y = (_isBranchChild) ? -cy : -cy + vSpace + vPosition;
 			
@@ -999,10 +977,8 @@
 		var c:Controller = super.getController();
 		
 		if(model instanceof CanvasModel) {
-			Debugger.log("canvas controller: " + c, Debugger.CRITICAL,'getController','CanvasBranchView');
 			return CanvasController(c);
 		} else {
-			Debugger.log("monitor controller: " + c, Debugger.CRITICAL,'getController','CanvasBranchView');
 			return MonitorController(c);
 		}
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as,v
diff -u -r1.75 -r1.76
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	27 Jun 2008 05:15:29 -0000	1.75
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	1 Jul 2008 04:41:11 -0000	1.76
@@ -353,7 +353,7 @@
 				
 			//give it the new co-ords and 'drop' it
 			
-				if(!ca.branchConnector) {
+				if(!ca.branchConnector || ca.branchConnector == undefined) {
 					ca.activity.xCoord = ca._x;
 					ca.activity.yCoord = ca._y;