Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rdaa2d39968bf48054c123266e356bffe0aaf0632 -r8c53f61ed4a3f15b302deda14d1126fd62608d8a
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rdaa2d39968bf48054c123266e356bffe0aaf0632 -r8c53f61ed4a3f15b302deda14d1126fd62608d8a
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -r017e5b3d4ea2b50ef99ee7609b8e0001968f8833 -r8c53f61ed4a3f15b302deda14d1126fd62608d8a
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 017e5b3d4ea2b50ef99ee7609b8e0001968f8833)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 8c53f61ed4a3f15b302deda14d1126fd62608d8a)
@@ -109,8 +109,10 @@
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
     public var removeEventListener:Function;
-    
+	
 	function ToolOutputConditionsDialog(){
+	
+	
 		_itemCount = 0;
 		this._visible = false;
 		
@@ -254,6 +256,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.width = _condition_item_dgd.width*0.4;
 		
 		var column_value:DataGridColumn = new DataGridColumn("conditionValue");
@@ -526,28 +529,35 @@
 	}
 	
 	private function selectDefinition():Void {
-		var ddm = app.getCanvas().ddm;
 		
 		_selectedDefinition = _toolOutputDefin_cmb.dataProvider[_toolOutputDefin_cmb.selectedIndex];
 		Debugger.log("select definition: " + _selectedDefinition.description, Debugger.CRITICAL, "selectDefinition", "ToolOutputConditionsDialog");
 		
 		switch(_selectedDefinition.type) {
 			case ToolOutputDefinition.LONG:
 				_condition_item_dgd.visible = true;
-				_toolOutputLongOptions_cmb.visible = true;
+							
+				if(_selectedDefinition.defaultConditions.length > 0) {
+					add_btn.visible = false;
+					_toolOutputLongOptions_cmb.visible = false;
 				
-				add_btn.visible = true;
-				optionChanged();
+					showSteppers(false, false);
+					addDefaultConditions(_selectedDefinition.defaultConditions);
+				} else {
+					add_btn.visible = true;
+					_toolOutputLongOptions_cmb.visible = true;
 				
-				_start_value_stp.minimum = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
-				_end_value_stp.minimum = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
-				_start_value_stp.maximum = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MAX;
-				_end_value_stp.maximum = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MAX;
+					optionChanged();
 				
-				_start_value_stp.value = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
-				_end_value_stp.value = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MIN;
+					_start_value_stp.minimum = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
+					_end_value_stp.minimum = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
+					_start_value_stp.maximum = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MAX;
+					_end_value_stp.maximum = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MAX;
+					
+					_start_value_stp.value = (_selectedDefinition.startValue != null) ? Number(_selectedDefinition.startValue) : STP_MIN;
+					_end_value_stp.value = (_selectedDefinition.endValue != null) ? Number(_selectedDefinition.endValue) : STP_MIN;
+				}
 				
-				
 				clear_all_btn.visible = true;
 				remove_item_btn.visible = true;
 				
@@ -560,17 +570,7 @@
 				add_btn.visible = false;
 				showSteppers(false, false);
 				
-				if(_condition_item_dgd.dataProvider.length <= 0) {
-					for(var i=0; i<_selectedDefinition.defaultConditions.length; i++) {
-						var condition:ToolOutputCondition = _selectedDefinition.defaultConditions[i];
-						condition.conditionUIID = ddm.newUIID();
-						condition.toolActivity = _toolActivity;
-						condition.branchingActivity = _branchingActivity;
-						
-						addCondition(condition);
-					}
-					
-				}
+				addDefaultConditions(_selectedDefinition.defaultConditions);
 				
 				break;
 			default:
@@ -584,6 +584,22 @@
 		
 	}
 	
+	private function addDefaultConditions(defaultConditions:Array):Void {
+		var ddm = app.getCanvas().ddm;
+		
+		if(_condition_item_dgd.dataProvider.length <= 0) {
+			for(var i=0; i<defaultConditions.length; i++) {
+				var condition:ToolOutputCondition = defaultConditions[i];
+				condition.conditionUIID = ddm.newUIID();
+				condition.toolActivity = _toolActivity;
+				condition.branchingActivity = _branchingActivity;
+						
+				addCondition(condition);
+			}
+					
+		}
+	}
+	
 	private function returnDefinitionState() {
 		_toolOutputDefin_cmb.selectedIndex = _selectedIndex;
 		_selectedDefinition = _toolOutputDefin_cmb.dataProvider[_selectedIndex];