Index: lams_central/web/lams_authoring.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring.swf,v
diff -u -r1.526.2.21 -r1.526.2.22
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lams_authoring_library.swf,v
diff -u -r1.426.2.21 -r1.426.2.22
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as,v
diff -u -r1.88.2.4 -r1.88.2.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	17 May 2009 23:16:26 -0000	1.88.2.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	18 May 2009 00:10:19 -0000	1.88.2.5
@@ -594,7 +594,7 @@
 					Debugger.log('activityDoubleClick CanvasBranchActivity:'+ca.activity.activityUIID,Debugger.CRITICAL,'activityDoubleClick','CanvasController');
 	   
 					_canvasModel.openBranchActivityContent(ca, true);
-					Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+					Application.getInstance().getToolbar().setButtonState("support_act_btn", false, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 					LFMenuBar.getInstance().enableArrangeActivities(false);
 					
 					// invalidate design after opening tool content window
@@ -742,7 +742,7 @@
 							_canvasModel.getCanvas().ddm.removeEntries(_canvasModel.getCanvas().ddm.getBranchMappingsByActivityUIIDAndType(ca.activity.activityUIID).all);
 						
 						if (ca.activity.isReferenceActivity()) {
-							Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
+							Application.getInstance().getToolbar().setButtonState("support_act_btn", true, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 						}
 
 						_canvasModel.removeComplexActivity(ca);	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as,v
diff -u -r1.50.2.2 -r1.50.2.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	15 May 2009 06:22:04 -0000	1.50.2.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	18 May 2009 00:10:22 -0000	1.50.2.3
@@ -212,7 +212,7 @@
 			
 			canvasModel.clearAllElements();
 			createContentFolder();
-			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
+			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 			
 			return true;
 		}else{
@@ -801,7 +801,7 @@
 		canvasModel.currentBranchingActivity = (parentBranching.activity.isBranchingActivity()) ? parentBranching : null;
 		
 		if (canvasModel.currentBranchingActivity == null && canvasModel.getReferenceActivityOnCanvas() == null) {
-			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, false);
+			Application.getInstance().getToolbar().setButtonState("support_act_btn", true, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 		}
 		if (canvasModel.activeView instanceof CanvasView) {
 			LFMenuBar.getInstance().enableArrangeActivities(true);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as,v
diff -u -r1.88.2.1 -r1.88.2.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	21 Apr 2009 02:09:45 -0000	1.88.2.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	18 May 2009 00:10:21 -0000	1.88.2.2
@@ -314,7 +314,7 @@
 		//_cv.ddm.referenceActivityUIID = referenceAct.activityUIID;
 		
 		// disable the reference activity button
-		Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+		Application.getInstance().getToolbar().setButtonState("support_act_btn", false, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 		
 		setDirty();
 		setSelectedItem(_activitiesDisplayed.get(referenceAct.activityUIID));
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as,v
diff -u -r1.34 -r1.34.2.1
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	27 Feb 2009 05:01:35 -0000	1.34
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	18 May 2009 00:10:23 -0000	1.34.2.1
@@ -320,7 +320,7 @@
 		}
 		else if(a.activityTypeID==Activity.REFERENCE_ACTIVITY_TYPE) {
 			
-			Application.getInstance().getToolbar().setButtonState("support_act_btn", false, false);
+			Application.getInstance().getToolbar().setButtonState("support_act_btn", false, Application.getInstance().getToolbar().view.isOptionalPanelVisible());
 			
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);