From fcac3c6233e369da6f91c2427427d84429694f6b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 15 May 2011 14:22:38 -0700
Subject: Disable the AO sit toolbar button when the AO is disabled

---
 linden/indra/newview/aoremotectrl.cpp                       | 13 ++++++++++---
 .../skins/default/xui/en-us/panel_ao_remote_expanded.xml    |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/aoremotectrl.cpp b/linden/indra/newview/aoremotectrl.cpp
index 781f1b3..6595835 100644
--- a/linden/indra/newview/aoremotectrl.cpp
+++ b/linden/indra/newview/aoremotectrl.cpp
@@ -88,15 +88,22 @@ BOOL AORemoteCtrl::postBuild()
 	childSetAction("ao_show_btn", onClickShowAO, this);
 	childSetAction("popup_btn", onClickPopupBtn, this);
 
+	childSetEnabled("ao_sit_btn", gSavedSettings.getBOOL("AOEnabled"));
+
 	return TRUE;
 }
 
 // static
 void AORemoteCtrl::onClickToggleAO(void* data)
 {
-	BOOL ao_enable = gSavedSettings.getBOOL("AOEnabled");
-	gSavedSettings.setBOOL("AOEnabled", !ao_enable);
-	LLFloaterAO::run();
+	AORemoteCtrl* self = (AORemoteCtrl*)data;
+	if (self)
+	{
+		BOOL ao_enable = gSavedSettings.getBOOL("AOEnabled");
+		gSavedSettings.setBOOL("AOEnabled", !ao_enable);
+		self->childSetEnabled("ao_sit_btn", !ao_enable);
+		LLFloaterAO::run();
+	}
 }
 
 //static 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
index d8b31f1..2d71add 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_ao_remote_expanded.xml
@@ -5,7 +5,7 @@
   <panel bottom="1" filename="panel_bg_tab.xml" name="panel_bg_tab" height="47" left="0" width="96" />
   <button bottom="-20" control_name="AOSitsEnabled" enabled="true" tool_tip="Toggles AO sit animation" 
 	     follows="left|top" font="SansSerif" height="22" label="Sits Off" label_selected="Sits On" 
-	     mouse_opaque="true" name="ao_sit_btn" width="66" left="3" />
+	     mouse_opaque="true" name="ao_sit_btn" width="66" left="3" label_selected_disabled="Sits Off" />
   <button bottom="-20" enabled="true" tool_tip="Toggle AO window"
        follows="left|top" font="SansSerif" height="22" label="" image_overlay="arrow_up.tga" 
        mouse_opaque="true" name="ao_show_btn" width="22" left_delta="68" />
-- 
cgit v1.1