Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -redfb806aa366570610c9306a5f5c54f33d37c76b -r5af5bb429bf92b434cc20f26d92b8bdb4dca5dbd
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -redfb806aa366570610c9306a5f5c54f33d37c76b -r5af5bb429bf92b434cc20f26d92b8bdb4dca5dbd
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -rdd43d4780be9412a87a66fa47a56619377e4a897 -r5af5bb429bf92b434cc20f26d92b8bdb4dca5dbd
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision dd43d4780be9412a87a66fa47a56619377e4a897)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 5af5bb429bf92b434cc20f26d92b8bdb4dca5dbd)
@@ -502,7 +502,7 @@
 			showAppliedGroupingControls(false);
 			showToolBasedBranchingControls(false);
 		}
-			
+		
 		if(e != null) {
 			branchType_lbl.enabled = e;
 			branchType_cmb.enabled = e;
@@ -512,6 +512,10 @@
 			
 			toolActs_cmb.enabled = e;
 		}
+		
+		if(_canvasModel.getCanvas().ddm.editOverrideLock) {
+			branchType_cmb.enabled = false;
+		}
 	}
 	
 	/**
@@ -978,8 +982,8 @@
 					selectToolActivityItem(i, toolActs_cmb.dataProvider[i].data);
 			}
 				
-			
-		} else {
+		} else {
+			
 			_canvasModel.selectedItem.activity.groupingUIID = null;
 			_canvasModel.selectedItem.activity.toolActivityUIID = null;