From b1aeeb190c8d0ebd652a8e874c894706b199ee9b Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 2 Sep 2010 17:51:44 -0700
Subject: Fixed 'cao on/off' commands not working in the chatbar

---
 linden/indra/newview/aoremotectrl.cpp       | 2 ++
 linden/indra/newview/chatbar_as_cmdline.cpp | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/aoremotectrl.cpp b/linden/indra/newview/aoremotectrl.cpp
index 8cafdd9..781f1b3 100644
--- a/linden/indra/newview/aoremotectrl.cpp
+++ b/linden/indra/newview/aoremotectrl.cpp
@@ -96,6 +96,7 @@ void AORemoteCtrl::onClickToggleAO(void* data)
 {
 	BOOL ao_enable = gSavedSettings.getBOOL("AOEnabled");
 	gSavedSettings.setBOOL("AOEnabled", !ao_enable);
+	LLFloaterAO::run();
 }
 
 //static 
@@ -103,6 +104,7 @@ void AORemoteCtrl::onClickToggleAOSit(void* data)
 {
 	BOOL sit_enable = gSavedSettings.getBOOL("AOSitsEnabled");
 	gSavedSettings.setBOOL("AOSitsEnabled", !sit_enable);
+	LLFloaterAO::run();
 }
 
 //static 
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index aae4fbe..59804c0 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -378,18 +378,18 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
                 {
 					if (status == "on" )
 					{
-						gSavedPerAccountSettings.setBOOL("AOEnabled",TRUE);
+						gSavedSettings.setBOOL("AOEnabled",TRUE);
 //						LLFloaterAO::init();
 						LLFloaterAO::run();
 					}
 					else if (status == "off" )
 					{
-						gSavedPerAccountSettings.setBOOL("AOEnabled",FALSE);
+						gSavedSettings.setBOOL("AOEnabled",FALSE);
 						LLFloaterAO::run();
 					}
 					else if (status == "sit" )
 					{
-						gSavedPerAccountSettings.setBOOL("AOSitsEnabled",!gSavedPerAccountSettings.getBOOL("AOSitsEnabled"));
+						gSavedSettings.setBOOL("AOSitsEnabled",!gSavedPerAccountSettings.getBOOL("AOSitsEnabled"));
 					}
 				}
 				return false;
-- 
cgit v1.1