Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rd7386d2fcb02d7c398f5b9ec0909cbdad305383c -r04425a2cd9dd2555c09c36a7988fdc0c728fcb8a
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rd7386d2fcb02d7c398f5b9ec0909cbdad305383c -r04425a2cd9dd2555c09c36a7988fdc0c728fcb8a
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
===================================================================
diff -u -r77eee398c52fbbce73bd7df19e8f5b1d5ad651fe -r04425a2cd9dd2555c09c36a7988fdc0c728fcb8a
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision 77eee398c52fbbce73bd7df19e8f5b1d5ad651fe)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision 04425a2cd9dd2555c09c36a7988fdc0c728fcb8a)
@@ -37,9 +37,11 @@
 	private var _description:String;
 	private var _type:String;
 	private var _startValue:Object;
-	private var _endValue:Object;
+	private var _endValue:Object;
+	private var _defaultConditions:Array;
 	
-	function ToolOutputDefinition(){
+	function ToolOutputDefinition(){
+		_defaultConditions = new Array();
 	}
 	
 	public function populateFromDTO(dto:Object):Void {
@@ -48,6 +50,15 @@
 		_type = dto.type;
 		_startValue = dto.startValue;
 		_endValue = dto.endValue;
+		if(dto.defaultConditions) {
+			for(var i=0; i<dto.defaultConditions.length; i++) {
+				var bdto:ToolOutputCondition = new ToolOutputCondition();
+				bdto.populateFromDTO(dto.defaultConditions[i]);
+				
+				_defaultConditions.push(bdto);
+			}
+		}
+			
 	}
 	
 	public function toData():Object {
@@ -100,7 +111,10 @@
 	
 	public function get endValue():Object {
 		return _endValue;
+	}
+	
+	public function get defaultConditions():Array {
+		return _defaultConditions;
 	}
 
-
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
diff -u -rd7386d2fcb02d7c398f5b9ec0909cbdad305383c -r04425a2cd9dd2555c09c36a7988fdc0c728fcb8a
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision d7386d2fcb02d7c398f5b9ec0909cbdad305383c)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	(.../ToolOutputConditionsDialog.as)	(revision 04425a2cd9dd2555c09c36a7988fdc0c728fcb8a)
@@ -561,8 +561,15 @@
 				showSteppers(false, false);
 				
 				if(_condition_item_dgd.dataProvider.length <= 0) {
-					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, _branchingActivity, true));
-					addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, _toolActivity, _branchingActivity, false));
+					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);
+					}
+					
 				}
 				
 				break;