Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -ree15dd3827f3fc08e09000fdc7cb920858517ff4 -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -ree15dd3827f3fc08e09000fdc7cb920858517ff4 -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
diff -u -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02 -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision 869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	(.../ToolActivity.as)	(revision fdaecf1d872c9a4ef732a7bd918f2edbc52767b4)
@@ -61,6 +61,7 @@
 	private var _competenceMappings:Array; // competences to which this activity is mapped
 	
 	private var _toolOutputDefinitions:Hashtable;
+	private var _useDefaultToolOutput:Boolean;
 	
 	function ToolActivity(activityUIID:Number){
 		super(activityUIID);
@@ -71,6 +72,8 @@
 		_toolOutputDefinitions = new Hashtable("_toolOutputDefinitions");
 		
 		_competenceMappings = new Array();
+		
+		_useDefaultToolOutput = false;
 	}
 	
 	//TODO: ADD A VALIDATE() FUNCTION
@@ -581,6 +584,24 @@
 	 */
 	public function get gradebookToolOutputDefinitionName ():String {
 		return _gradebookToolOutputDefinitionName;
-	}	
+	}
+	
+	/**
+	 * 
+	 * @usage   sets a flag to indicate if we want the default gradebook tool output to be selected in the gradebook output combo box in the PI
+	 * @param   n the name of the tooloutput 
+	 */
+	public function set useDefaultToolOutput(n:Boolean) {
+		_useDefaultToolOutput = n;
+	}
+	
+	/**
+	 * 
+	 * @usage   
+	 * @return  _useDefaultToolOutput a flag indicating whether we want to default output for that tool to show
+	 */
+	public function get useDefaultToolOutput():Boolean {
+		return _useDefaultToolOutput;
+	}
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
===================================================================
diff -u -re76b614d9ca801a4634a2103838784a094d10d32 -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision e76b614d9ca801a4634a2103838784a094d10d32)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as	(.../ToolOutputDefinition.as)	(revision fdaecf1d872c9a4ef732a7bd918f2edbc52767b4)
@@ -45,6 +45,7 @@
 	private var _complexDefinition:Object;
 	private var _defaultConditions:Array;
 	private var _showConditionNameOnly:Boolean;
+	private var _isDefaultGradebookMark:Boolean;
 	
 	function ToolOutputDefinition(){
 		_defaultConditions = new Array();
@@ -56,6 +57,8 @@
 		_type = dto.type;
 		_startValue = dto.startValue;
 		_endValue = dto.endValue;
+		_isDefaultGradebookMark = dto.isDefaultGradebookMark;
+		
 		if(dto.defaultConditions) {
 			for(var i=0; i<dto.defaultConditions.length; i++) {
 				var bdto:ToolOutputCondition = new ToolOutputCondition();
@@ -77,6 +80,7 @@
 		if(_type) dto.type = _type;
 		if(_startValue) dto.startValue = _startValue;
 		if(_endValue) dto.endValue = _endValue;
+		if(_isDefaultGradebookMark != null) dto.isDefaultGradebookMark = _isDefaultGradebookMark;
 		
 		return dto;
 	}
@@ -121,6 +125,14 @@
 		return _endValue;
 	}
 	
+	public function set isDefaultGradebookMark(a:Boolean) {
+		_isDefaultGradebookMark = a;
+	}
+	
+	public function get isDefaultGradebookMark():Boolean {
+		return _isDefaultGradebookMark;
+	}
+	
 	public function get complexDefinition():Object {
 		return _complexDefinition;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
diff -u -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02 -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision 869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(.../Canvas.as)	(revision fdaecf1d872c9a4ef732a7bd918f2edbc52767b4)
@@ -373,6 +373,7 @@
 				actType = "Tool"
 				actToAdd = ToolActivity(actToCopy.clone());
 				actToAdd.activityUIID = _ddm.newUIID();
+				ToolActivity(actToAdd).useDefaultToolOutput = true;
 				break;
 
 			case(Activity.OPTIONAL_ACTIVITY_TYPE):
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -r869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02 -rfdaecf1d872c9a4ef732a7bd918f2edbc52767b4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 869e666f97fbe8a32b9c63cc1bddc4a12f1a5f02)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision fdaecf1d872c9a4ef732a7bd918f2edbc52767b4)
@@ -800,8 +800,8 @@
 	private function setGradebookOutput(evt:Object) {
 		
 		if (_canvasModel.selectedItem.activity.activityTypeID == Activity.TOOL_ACTIVITY_TYPE) {
-			
 			var toolAct:ToolActivity = ToolActivity(_canvasModel.selectedItem.activity);
+			toolAct.useDefaultToolOutput = false;
 			if (evt.target.selectedIndex > 0) {
 				toolAct.gradebookToolOutputDefinitionName = evt.target.selectedItem.name;
 			} else {
@@ -811,26 +811,48 @@
 	}
 	
 	private function showActivityOutputProperties(a) {
-		
+		var outputExists:Boolean = false; // true if an output for this activity has been saved previously
+		var defaultIndex:Number = 0;
 		if (a.activityTypeID == Activity.TOOL_ACTIVITY_TYPE) {
 			var toolAct:ToolActivity = ToolActivity(a);
 			outputToGradebook_cmb.dataProvider = (toolAct.supportsOutputs == true) ? getToolActivityOutputTypes(toolAct) : null;
 			
-			if (toolAct.gradebookToolOutputDefinitionName != null) {
+			if (toolAct.supportsOutputs && outputToGradebook_cmb.dataProvider.length > 1) {
+				gradebook_lbl.visible = true;
+				outputToGradebook_cmb.visible = true;
+				
 				for (var i=0; i<outputToGradebook_cmb.dataProvider.length; i++) {
-					if (outputToGradebook_cmb.dataProvider[i].name == toolAct.gradebookToolOutputDefinitionName) {
-						outputToGradebook_cmb.selectedIndex = i;
+					if (toolAct.gradebookToolOutputDefinitionName != null) {
+						if (outputToGradebook_cmb.dataProvider[i].name == toolAct.gradebookToolOutputDefinitionName) { // see if a gradebook output has been saved for this tool already
+							outputExists = true;
+							outputToGradebook_cmb.selectedIndex = i;
+						}
 					}
+					if (toolAct.useDefaultToolOutput == true && outputExists == false) { // if it hasn't been saved check if this is the default output
+						if (outputToGradebook_cmb.dataProvider[i].isDefaultGradebookMark == true) {
+							defaultIndex = i;
+						}
+					}
 				}
-			}else if (!toolAct.supportsOutputs) {
+				if (toolAct.useDefaultToolOutput == true && outputExists == false) { // set to default output if no previous output saved
+					outputToGradebook_cmb.selectedIndex = defaultIndex;
+					toolAct.gradebookToolOutputDefinitionName = outputToGradebook_cmb.dataProvider[defaultIndex].name;
+				}
+			} else {
 				gradebook_lbl.visible = false;
 				outputToGradebook_cmb.visible = false;
 			}
 		}
 	}
 	
 	private function getToolActivityOutputTypes(toolAct:ToolActivity):Array {
-		var _definitions:Array = toolAct.definitions;
+		var _definitions:Array = new Array();
+		
+		for (var i=0; i<toolAct.definitions.length; i++) {
+			if (toolAct.definitions[i].type == ToolOutputDefinition.LONG) { //only support numeric outputs
+				_definitions.push(toolAct.definitions[i]);
+			}
+		}
 		_definitions.splice(0,0, new ToolOutputDefinition()); // add an empty toolOutputDefinition for first entry where itemObj.type = null
 		return _definitions;
 	}