Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rb6aefa99414741f15c93b20323fc672ced42ccb3 -rda1644d8e66121854689bf4c74caa46457502601
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rb6aefa99414741f15c93b20323fc672ced42ccb3 -rda1644d8e66121854689bf4c74caa46457502601
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
diff -u -rc41b98701f4bbfe9e71e5653ac295ea5c1edf5c3 -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision c41b98701f4bbfe9e71e5653ac295ea5c1edf5c3)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	(.../DesignDataModel.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -1118,13 +1118,15 @@
 	public function getAllConditions():Array {
 		return _outputConditions.values();
 	}
-	public function getAllConditionsForToolOutput(toolActivityUIID:Number):Array {
+	
+	public function getAllConditionsForToolOutput(branchingActivity:BranchingActivity):Array {
 		var conditions:Array = getAllConditions();
 		var rConditions:Array = new Array();
 		
 		for(var i=0; i<conditions.length; i++) {
-			if(conditions[i].toolActivity.activityUIID = toolActivityUIID)
-				rConditions.push(conditions[i]);
+			if(conditions[i].toolActivity.activityUIID == branchingActivity.toolActivityUIID &&
+				conditions[i].branchingActivity.activityUIID == branchingActivity.activityUIID)
+					rConditions.push(conditions[i]);
 		}
 		
 		return rConditions;
@@ -1174,7 +1176,8 @@
 				mappingsToRemove.push(Array(mappings.groupBased));
 			
 			for(var j=0; j<mappings.toolBased.length; j++)
-				if(mappings.toolBased[j].condition.toolActivity.activityUIID != BranchingActivity(tActs[i]).toolActivityUIID)
+				if(mappings.toolBased[j].condition.toolActivity.activityUIID != BranchingActivity(tActs[i]).toolActivityUIID &&
+					mappings.toolBased[j].condition.branchingActivity.activityUIID == BranchingActivity(tActs[i]).activityUIID)
 					mappingsToRemove.push(mappings.toolBased[j]);
 		}
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as
===================================================================
diff -u -rcd33f92df2c46dfe2e817281d501e179a6094637 -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as	(.../ToolOutputBranchActivityEntry.as)	(revision cd33f92df2c46dfe2e817281d501e179a6094637)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as	(.../ToolOutputBranchActivityEntry.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -38,7 +38,8 @@
 		this.sequenceActivity = sequenceActivity;
 		this.branchingActivity = branchingActivity;
 		
-		this.condition = condition;
+		this.condition = condition;
+		this.condition.branchingActivity = branchingActivity;
 	}
 
 	public function toData():Object {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
===================================================================
diff -u -r7c8ff663c07662a984677b2ed751754346226590 -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -43,7 +43,7 @@
 	private var _endValue:Object;
 	private var _exactMatchValue:Object;
 	
-	private var _branchingActivity:Activity;
+	private var _branchingActivity:BranchingActivity;
 	private var _toolActivity:ToolActivity;
 	
 	function ToolOutputCondition(conditionID:Number, conditionUIID:Number, name:String, type:String, startValue:Object, endValue:Object, exactMatchValue:Object, displayName:String){
@@ -59,7 +59,7 @@
 		_display_name = displayName;
 	}
 	
-	public static function createBoolCondition(UIID:Number, definition:ToolOutputDefinition, toolActivity:ToolActivity, value:Boolean):ToolOutputCondition {
+	public static function createBoolCondition(UIID:Number, definition:ToolOutputDefinition, toolActivity:ToolActivity, branchingActivity:BranchingActivity, value:Boolean):ToolOutputCondition {
 		var condition:ToolOutputCondition = new ToolOutputCondition();
 		condition.conditionUIID = UIID;
 		
@@ -69,12 +69,13 @@
 			condition.displayName = definition.type + " (" + String(value) + ") ";
 			condition.exactMatchValue = value;
 			condition.toolActivity = toolActivity;
+			condition.branchingActivity = branchingActivity;
 		}
 		
 		return condition;
 	}
 	
-	public static function createLongCondition(UIID:Number, displayName:String, definition:ToolOutputDefinition, toolActivity:ToolActivity, startValue:Number, endValue:Number):ToolOutputCondition {
+	public static function createLongCondition(UIID:Number, displayName:String, definition:ToolOutputDefinition, toolActivity:ToolActivity, branchingActivity:BranchingActivity, startValue:Number, endValue:Number):ToolOutputCondition {
 		var condition:ToolOutputCondition = new ToolOutputCondition();
 		condition.conditionUIID = UIID;
 		
@@ -91,6 +92,7 @@
 			}
 			
 			condition.toolActivity = toolActivity;
+			condition.branchingActivity = branchingActivity;
 		}
 		
 		return condition;
@@ -209,6 +211,14 @@
 	
 	public function get toolActivity():ToolActivity {
 		return _toolActivity;
+	}
+	
+	public function set branchingActivity(a:BranchingActivity) {
+		_branchingActivity = a;
+	}
+	
+	public function get branchingActivity():BranchingActivity {
+		return _branchingActivity;
 	}
 
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as
===================================================================
diff -u -r7c8ff663c07662a984677b2ed751754346226590 -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	(.../ConditionMatchingDialog.as)	(revision 7c8ff663c07662a984677b2ed751754346226590)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	(.../ConditionMatchingDialog.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -96,6 +96,7 @@
 	public function loadLists() {
 		Debugger.log("Loading Lists: branch length: " + branches.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
 		Debugger.log("Loading Lists: branching act: " + _branchingActivity.activityUIID, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
+		Debugger.log("Loading Lists: conditions length: " + conditions.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
 		
 		conditions_lst.dataProvider = conditions;
 		conditions_lst.sortItemsBy("conditionUIID", Array.NUMERIC);
@@ -124,7 +125,8 @@
 		Debugger.log("Loading Lists: mappings length: " + mappings.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
 		
 		for(var i=0; i < mappings.length; i++) {
-			if(mappings[i].condition.toolActivity.activityUIID == _branchingActivity.toolActivityUIID) {
+			if(mappings[i].condition.toolActivity.activityUIID == _branchingActivity.toolActivityUIID &&
+				mappings[i].condition.branchingActivity.activityUIID == _branchingActivity.activityUIID) {
 				match_dgd.addItem(mappings[i]);
 				removeCondition(mappings[i].condition);
 			}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r0c0c3c9f3e428a5fdeb5721b450a89fbe2c340c6 -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 0c0c3c9f3e428a5fdeb5721b450a89fbe2c340c6)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -248,7 +248,8 @@
 		var branches:Array = app.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(_branchingActivity.activityUIID).toolBased;
 		
 		for(var i=0; i<branches.length; i++) {
-			if(branches[i].condition.toolActivity.activityUIID == _toolActivity.activityUIID) {
+			if(branches[i].condition.toolActivity.activityUIID == _toolActivity.activityUIID && 
+				branches[i].condition.branchingActivity == _branchingActivity.activityUIID) {
 				addCondition(branches[i].condition);
 				if(_condition_item_dgd.length==1) setDefinition(branches[i].condition.name);
 			}
@@ -269,8 +270,8 @@
 	
 	private function addButton_onPress():Void {
 		if(validateCondition(_selectedDefinition))
-			if(Boolean(_opt_greaterThan_cb.value)) addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), Dictionary.getValue("to_condition_untitled_item_lbl", [Number(_condition_item_dgd.length+1)]), _selectedDefinition, _toolActivity, _start_value_stp.value, null));
-			else addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), Dictionary.getValue("to_condition_untitled_item_lbl", [Number(_condition_item_dgd.length+1)]), _selectedDefinition, _toolActivity, _start_value_stp.value, _end_value_stp.value));
+			if(Boolean(_opt_greaterThan_cb.value)) addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), Dictionary.getValue("to_condition_untitled_item_lbl", [Number(_condition_item_dgd.length+1)]), _selectedDefinition, _toolActivity, _branchingActivity, _start_value_stp.value, null));
+			else addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), Dictionary.getValue("to_condition_untitled_item_lbl", [Number(_condition_item_dgd.length+1)]), _selectedDefinition, _toolActivity, _branchingActivity, _start_value_stp.value, _end_value_stp.value));
 	}
 	
 	private function clearAllButton_onPress(evt:Object, c:Boolean):Void {
@@ -466,8 +467,8 @@
 				_condition_to_lbl.visible = false;
 				
 				if(_condition_item_dgd.dataProvider.length <= 0) {
-					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, true));
-					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, false));
+					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, _branchingActivity, true));
+					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, _branchingActivity, false));
 				}
 				
 				break;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
diff -u -r5ebc04888c42799642c9249df906922db6af4450 -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision 5ebc04888c42799642c9249df906922db6af4450)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(.../PropertyInspectorControls.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -994,7 +994,8 @@
 		Debugger.log("Loading Lists: mappings length: " + mappings.length, Debugger.CRITICAL, "loadLists", "ConditionMatchingDialog");
 		
 		for(var i=0; i < mappings.length; i++) {
-			if(mappings[i].condition.toolActivity.activityUIID == UIID) {
+			if(mappings[i].condition.toolActivity.activityUIID == UIID &&
+				mappings[i].condition.branchingActivity.activityUIID == _canvasModel.selectedItem.activity.activityUIID) {
 				toolActs_cmb.selectedIndex = index;
 				branchToolInputChange(_canvasModel.selectedItem, toolActs_cmb.dataProvider[index].data);
 			}
@@ -1226,7 +1227,7 @@
 	
 	private function ConditionMatchDialogLoaded(evt:Object) {
 		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
-		var conditions:Array = _canvasModel.getCanvas().ddm.getAllConditionsForToolOutput(BranchingActivity(_canvasModel.selectedItem.activity).toolActivityUIID);
+		var conditions:Array = _canvasModel.getCanvas().ddm.getAllConditionsForToolOutput(BranchingActivity(_canvasModel.selectedItem.activity));
 		
 		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
 		evt.target.scrollContent.conditions = conditions;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
diff -u -r6c292664546290ce3a5a05afd8e487fb635d41ca -rda1644d8e66121854689bf4c74caa46457502601
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision 6c292664546290ce3a5a05afd8e487fb635d41ca)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	(.../ApplicationParent.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
@@ -257,7 +257,7 @@
     */
     static function get dialogue():MovieClip {
         //Return root if valid otherwise raise a big system error as app. will not work without it
-        if(_instance._dialogueContainer_mc != undefined) {
+        if(_instance.dialogueContainer != undefined) {
             return _instance.dialogueContainer;
         } else {
             //TODO DI 11/05/05 Raise error if mc hasn't been created
@@ -270,7 +270,8 @@
 	}
 	
 	public function get dialogueContainer():MovieClip {
-		if(_dialogueContainer_mc == undefined) _dialogueContainer_mc = _appRoot_mc.createEmptyMovieClip('_dialogueContainer_mc', DIALOGUE_DEPTH);
+		Debugger.log("check application root: " + _appRoot_mc, Debugger.CRITICAL, "dialogueContainer", "ApplicationParent");
+		if(_dialogueContainer_mc == undefined || _dialogueContainer_mc == null) _dialogueContainer_mc = _appRoot_mc.createEmptyMovieClip('_dialogueContainer_mc', DIALOGUE_DEPTH);
 		return _dialogueContainer_mc;
 	}