diff options
author | McCabe Maxsted | 2010-09-02 17:51:44 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-09-02 17:51:44 -0700 |
commit | b1aeeb190c8d0ebd652a8e874c894706b199ee9b (patch) | |
tree | 9c24803e0ab8567b12ebf6bbb5c8fd7af26ee74e /linden/indra/newview | |
parent | Fixed domain suffixes showing up as misspelled (diff) | |
download | meta-impy-b1aeeb190c8d0ebd652a8e874c894706b199ee9b.zip meta-impy-b1aeeb190c8d0ebd652a8e874c894706b199ee9b.tar.gz meta-impy-b1aeeb190c8d0ebd652a8e874c894706b199ee9b.tar.bz2 meta-impy-b1aeeb190c8d0ebd652a8e874c894706b199ee9b.tar.xz |
Fixed 'cao on/off' commands not working in the chatbar
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/aoremotectrl.cpp | 2 | ||||
-rw-r--r-- | linden/indra/newview/chatbar_as_cmdline.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
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) | |||
96 | { | 96 | { |
97 | BOOL ao_enable = gSavedSettings.getBOOL("AOEnabled"); | 97 | BOOL ao_enable = gSavedSettings.getBOOL("AOEnabled"); |
98 | gSavedSettings.setBOOL("AOEnabled", !ao_enable); | 98 | gSavedSettings.setBOOL("AOEnabled", !ao_enable); |
99 | LLFloaterAO::run(); | ||
99 | } | 100 | } |
100 | 101 | ||
101 | //static | 102 | //static |
@@ -103,6 +104,7 @@ void AORemoteCtrl::onClickToggleAOSit(void* data) | |||
103 | { | 104 | { |
104 | BOOL sit_enable = gSavedSettings.getBOOL("AOSitsEnabled"); | 105 | BOOL sit_enable = gSavedSettings.getBOOL("AOSitsEnabled"); |
105 | gSavedSettings.setBOOL("AOSitsEnabled", !sit_enable); | 106 | gSavedSettings.setBOOL("AOSitsEnabled", !sit_enable); |
107 | LLFloaterAO::run(); | ||
106 | } | 108 | } |
107 | 109 | ||
108 | //static | 110 | //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) | |||
378 | { | 378 | { |
379 | if (status == "on" ) | 379 | if (status == "on" ) |
380 | { | 380 | { |
381 | gSavedPerAccountSettings.setBOOL("AOEnabled",TRUE); | 381 | gSavedSettings.setBOOL("AOEnabled",TRUE); |
382 | // LLFloaterAO::init(); | 382 | // LLFloaterAO::init(); |
383 | LLFloaterAO::run(); | 383 | LLFloaterAO::run(); |
384 | } | 384 | } |
385 | else if (status == "off" ) | 385 | else if (status == "off" ) |
386 | { | 386 | { |
387 | gSavedPerAccountSettings.setBOOL("AOEnabled",FALSE); | 387 | gSavedSettings.setBOOL("AOEnabled",FALSE); |
388 | LLFloaterAO::run(); | 388 | LLFloaterAO::run(); |
389 | } | 389 | } |
390 | else if (status == "sit" ) | 390 | else if (status == "sit" ) |
391 | { | 391 | { |
392 | gSavedPerAccountSettings.setBOOL("AOSitsEnabled",!gSavedPerAccountSettings.getBOOL("AOSitsEnabled")); | 392 | gSavedSettings.setBOOL("AOSitsEnabled",!gSavedPerAccountSettings.getBOOL("AOSitsEnabled")); |
393 | } | 393 | } |
394 | } | 394 | } |
395 | return false; | 395 | return false; |