Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -r8e2a8eb4f870951aecf5e713a7a2cc8cc834e68f -r0119b3e78a89cc6aec4923f3d6b47e849ea91135
Binary files differ
Index: lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
diff -u -rb87f0387dcb18faa0b320fbaa7bc4a8b9ee4b845 -r0119b3e78a89cc6aec4923f3d6b47e849ea91135
--- lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision b87f0387dcb18faa0b320fbaa7bc4a8b9ee4b845)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(.../WorkspaceDialog.as)	(revision 0119b3e78a89cc6aec4923f3d6b47e849ea91135)
@@ -45,7 +45,7 @@
     private var cancel_btn:Button;
     private var panel:MovieClip;            //The underlaying panel base
     
-	private var switchView_tab:TabBar;
+	private var switchView_tab:MovieClip;
 	
 	//location tab elements
 	private var treeview:Tree;              //Treeview for navigation through workspace folder structure
@@ -92,8 +92,11 @@
 	
 
     private var _selectedDesignId:Number;
-    
+    private var _currentTab:Number;
+	
 	private static var OTHER_LICENSE_ID:Number = 2;
+	private static var LOCATION_TAB:Number = 0;
+	private static var PROP_TAB:Number = 1;
 	
     //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -484,7 +487,7 @@
 		}
 		
 		// if Other Licensing Agreement is selected then show the textarea box for addition comments
-		if(licenseID_cmb.value.licenseID == OTHER_LICENSE_ID){
+		if((licenseID_cmb.value.licenseID == OTHER_LICENSE_ID) && (_currentTab == PROP_TAB)){
 			license_txa.visible = true;
 			license_comment_lbl.visible = true;
 		} else {
@@ -522,13 +525,17 @@
 		Debugger.log('v:'+v,Debugger.GEN,'setPropertiesContentVisible','org.lamsfoundation.lams.ws.WorkspaceDialog');
 		description_lbl.visible = v;
 		license_lbl.visible = v;
-		license_comment_lbl.visible = false;
 		resourceDesc_txa.visible = v;
-		license_txa.visible = false;
 		licenseImg_pnl.visible = v;
 		viewLicense_btn.visible = v;
 		
-	
+		if(licenseID_cmb.value.licenseID == OTHER_LICENSE_ID) {
+			license_comment_lbl.visible = v;
+			license_txa.visible = v;
+		} else {
+			license_comment_lbl.visible = false;
+			license_txa.visible = false;
+		}
 
 	}
 	
@@ -545,13 +552,12 @@
 		if(tabToSelect == "LOCATION"){
 			setLocationContentVisible(true);
 			setPropertiesContentVisible(false);
-			
+			_currentTab = LOCATION_TAB;
 				
-				
 		}else if(tabToSelect == "PROPERTIES"){
 			setLocationContentVisible(false);
 			setPropertiesContentVisible(true);
-			
+			_currentTab = PROP_TAB;
 		
 		}