Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rf03fd1276cceb9e2c56bc9514a99db809ad53dad -ra8c2b049ede9a3547e87cd943a4b63add2e00eae
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rf03fd1276cceb9e2c56bc9514a99db809ad53dad -ra8c2b049ede9a3547e87cd943a4b63add2e00eae
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
===================================================================
diff -u -rda1644d8e66121854689bf4c74caa46457502601 -ra8c2b049ede9a3547e87cd943a4b63add2e00eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision da1644d8e66121854689bf4c74caa46457502601)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	(.../ToolOutputCondition.as)	(revision a8c2b049ede9a3547e87cd943a4b63add2e00eae)
@@ -45,6 +45,8 @@
 	
 	private var _branchingActivity:BranchingActivity;
 	private var _toolActivity:ToolActivity;
+	
+	private var _isDefault:Boolean;
 	
 	function ToolOutputCondition(conditionID:Number, conditionUIID:Number, name:String, type:String, startValue:Object, endValue:Object, exactMatchValue:Object, displayName:String){
 		_conditionID = conditionID;
@@ -56,7 +58,9 @@
 		_endValue = endValue;
 		_exactMatchValue = exactMatchValue;
 		
-		_display_name = displayName;
+		_display_name = displayName;
+		
+		_isDefault = false;
 	}
 	
 	public static function createBoolCondition(UIID:Number, definition:ToolOutputDefinition, toolActivity:ToolActivity, branchingActivity:BranchingActivity, value:Boolean):ToolOutputCondition {
@@ -220,6 +224,13 @@
 	public function get branchingActivity():BranchingActivity {
 		return _branchingActivity;
 	}
+
+	public function set isDefault(a:Boolean) {
+		_isDefault = a;
+	}
+	
+	public function get isDefault():Boolean {
+		return _isDefault;
+	}
 
-
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce -ra8c2b049ede9a3547e87cd943a4b63add2e00eae
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 6d1e7fa43f6a6ddfd559371f5dd9f129525c1bce)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision a8c2b049ede9a3547e87cd943a4b63add2e00eae)
@@ -273,7 +273,7 @@
 		
 		var column_name:DataGridColumn = new DataGridColumn("conditionName");
 		column_name.headerText = Dictionary.getValue("to_conditions_dlg_condition_items_name_col_lbl");
-		column_name.editable = true;
+		column_name.editable = !(_selectedDefinition.defaultConditions.length > 0);
 		
 		column_name.width = (hideValueColumn) ?  _condition_item_dgd.width : _condition_item_dgd.width*0.4;
 		
@@ -590,6 +590,7 @@
 				
 					showSteppers(false, false);
 					addDefaultConditions(_selectedDefinition.defaultConditions);
+					
 				} else {
 					add_btn.visible = true;
 					remove_item_btn.visible = true;
@@ -664,7 +665,8 @@
 				condition.conditionUIID = ddm.newUIID();
 				condition.toolActivity = _toolActivity;
 				condition.branchingActivity = _branchingActivity;
-						
+				condition.isDefault = true;
+				
 				addCondition(condition);
 			}