Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.523 -r1.524
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.423 -r1.424
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as,v
diff -u -r1.51 -r1.52
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	27 Feb 2009 05:01:35 -0000	1.51
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	10 Mar 2009 00:43:02 -0000	1.52
@@ -446,17 +446,17 @@
 		
 		//select the new thing
 		if (taParent != undefined || taParent != null){
-			var sequenceAct:Activity = canvasModel.getCanvas().ddm.getActivityByUIID(taParent);
-			if(sequenceAct.isSequenceActivity() && sequence != null) {
-				actToAdd.orderID = canvasModel.getCanvas().ddm.getNextSequenceOrderID(sequenceAct.activityUIID);
+			var parentActivity:Activity = canvasModel.getCanvas().ddm.getActivityByUIID(taParent);
+			if(parentActivity.isSequenceActivity() && sequence != null) {
+				actToAdd.orderID = canvasModel.getCanvas().ddm.getNextSequenceOrderID(parentActivity.activityUIID);
 				
 				Debugger.log("sequence.lastActivity: " + sequence.lastActivity, Debugger.CRITICAL, "setDroppedTemplateActivity", "Canvas");
 				
 				if(actToAdd.orderID > 1) canvasModel.createSequenceTransition(sequence.lastActivity, actToAdd);
-				else ComplexActivity(sequenceAct).firstActivityUIID = actToAdd.activityUIID;							
+				else ComplexActivity(parentActivity).firstActivityUIID = actToAdd.activityUIID;							
 				
 				if(!(canvasModel.activeView instanceof CanvasComplexView)) {
-					canvasModel.removeActivity(sequenceAct.parentUIID); 
+					canvasModel.removeActivity(parentActivity.parentUIID); 
 				}
 			}
 			
@@ -469,6 +469,12 @@
 				canvasModel.activeView.updateActivity();
 			}
 			
+			if (canvasModel.activeView instanceof CanvasBranchView) {
+				if(_ddm.getComplexActivityChildren(canvasModel.activeView.defaultSequenceActivity.activityUIID).length <= 0) {
+					canvasModel.activeView.defaultSequenceActivity.empty = true;
+				}
+			}
+			
 			canvasModel.setDirty();
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as,v
diff -u -r1.39 -r1.40
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	6 Feb 2009 04:21:27 -0000	1.39
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as	10 Mar 2009 00:43:02 -0000	1.40
@@ -1022,6 +1022,12 @@
 		removeActivity(ca.activity.activityUIID);
 		if(doRemoveParent) removeActivity(parentID);
 		
+		if (activeView instanceof CanvasBranchView) {
+			if(_cv.ddm.getComplexActivityChildren(activeView.defaultSequenceActivity.activityUIID).length <= 0) {
+				activeView.defaultSequenceActivity.empty = true;
+			}
+		}
+		
 		setDirty();
 	}