Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r7b490643c46055810ef746bf38ca08afd9538277 -r7ccd0e62538d93998769e00323428ec734b2a194
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -r7b490643c46055810ef746bf38ca08afd9538277 -r7ccd0e62538d93998769e00323428ec734b2a194
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateConditionMatchingDialog.as
===================================================================
diff -u -r26fcfdc7b9da9fac6431387aa086debd49b6c737 -r7ccd0e62538d93998769e00323428ec734b2a194
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateConditionMatchingDialog.as	(.../GateConditionMatchingDialog.as)	(revision 26fcfdc7b9da9fac6431387aa086debd49b6c737)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateConditionMatchingDialog.as	(.../GateConditionMatchingDialog.as)	(revision 7ccd0e62538d93998769e00323428ec734b2a194)
@@ -208,7 +208,7 @@
 	
 	private function setupMatch(condition:ToolOutputCondition, gateState):Void {
 		
-		var gateOpenWhenConditionMet:Boolean = (gateState.objState == "open") ? true : false;
+		var gateOpenWhenConditionMet:Boolean = (gateState.value == "open") ? true : false;
 		var toMatch:ToolOutputGateActivityEntry = new ToolOutputGateActivityEntry(null, app.getCanvas().ddm.newUIID(), gateActivity, condition, gateOpenWhenConditionMet);
 		
 		match_dgd.addItem(toMatch);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -r0e378dd9696fcf3cd772974aa98f0cef54fdb972 -r7ccd0e62538d93998769e00323428ec734b2a194
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 0e378dd9696fcf3cd772974aa98f0cef54fdb972)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 7ccd0e62538d93998769e00323428ec734b2a194)
@@ -316,6 +316,17 @@
 		}
 		else if(a.activityTypeID==Activity.REFERENCE_ACTIVITY_TYPE) {
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
+			
+			// If any of the child reference activities have been attempted make the parent reference activity readonly (for live edit)
+			if (!a.isReadOnly()) {
+				for (var i=0; i<children.length; i++) {
+					if (children[i].isReadOnly()) {
+						cm.getCanvas().ddm.getActivityByUIID(a.parentUIID).readOnly = true;
+						a.readOnly = true;
+					}
+				}
+			}
+			
 			var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasReferenceActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cvc,_canvasView:cvv,_locked:a.isReadOnly()});
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 		} 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjState.as
===================================================================
diff -u -r64f42c88ebf08393b1c53bbd00c3cd4fec211c10 -r7ccd0e62538d93998769e00323428ec734b2a194
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjState.as	(.../ObjState.as)	(revision 64f42c88ebf08393b1c53bbd00c3cd4fec211c10)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjState.as	(.../ObjState.as)	(revision 7ccd0e62538d93998769e00323428ec734b2a194)
@@ -20,7 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ************************************************************************
  */
- 
+
 /**
 * Util methods for string manipulation
 * @class	State
@@ -30,11 +30,11 @@
 class org.lamsfoundation.lams.common.util.ObjState {
 	
 	private var _displayText:String;
-	private var _objState:Object;
+	private var _value:Object;
 	
-	function ObjState(displayText:String, objState:Object){
-		this.displayText = displayText;
-		this.objState = objState;
+	function ObjState(displayText:String, value:Object){
+		_displayText = displayText;
+		_value = value;
 	}
 	
 	public function get displayText():String {
@@ -45,11 +45,11 @@
 		_displayText = s;
 	}
 	
-	public function get objState():Object {
-		return _objState;
+	public function get value():Object {
+		return _value;
 	}
 	
-	public function set objState(s:Object):Void {
-		_objState = s;
+	public function set value(s:Object):Void {
+		_value = s;
 	}
 }
\ No newline at end of file