Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.450 -r1.451
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.350 -r1.351
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as,v
diff -u -r1.38 -r1.39
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	4 Jun 2008 05:05:42 -0000	1.38
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	6 Jun 2008 06:07:28 -0000	1.39
@@ -696,7 +696,7 @@
 			}
 		}
 		
-		if(_canvasModel.getCanvas().ddm.editOverrideLock) {
+		if(_canvasModel.getCanvas().ddm.editOverrideLock && _canvasModel.selectedItem.activity.activityID != null) {
 			branchType_cmb.enabled = false;
 		}