New chat channel preference should change only on apply

2 files changed, 15 insertions, 18 deletions

diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 82ae07c..f3b7278 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -47,13 +47,10 @@ class LLPrefsChatImpl : public LLPanel
 public:
         LLPrefsChatImpl();
         /*virtual*/ ~LLPrefsChatImpl(){};
-        /*virtual*/ BOOL postBuild();
 
         void apply();
         void cancel();
 
-        static void onCheckToggleChannel(LLUICtrl* ctrl, void* user_data);
-
 protected:
         S32     mChatSize;
         F32     mChatPersist;
@@ -74,6 +71,7 @@ protected:
         BOOL mPlayTypingAnim;
         BOOL mChatBubbles;
         BOOL mScriptErrorAsChat;
+        BOOL mChatChannel;
         F32     mConsoleOpacity;
         F32     mBubbleOpacity;
 };
@@ -105,6 +103,7 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         childSetValue("chat_full_width_check", gSavedSettings.getBOOL("ChatFullWidth"));
         childSetValue("close_chat_on_return_check", gSavedSettings.getBOOL("CloseChatOnReturn"));
         childSetValue("play_typing_animation", gSavedSettings.getBOOL("PlayTypingAnim"));
+        childSetValue("toggle_channel_control", gSavedSettings.getBOOL("ChatChannelSelect"));
         childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
         childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
 
@@ -128,17 +127,11 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         mChatFullWidth = gSavedSettings.getBOOL("ChatFullWidth");
         mCloseChatOnReturn = gSavedSettings.getBOOL("CloseChatOnReturn");
         mPlayTypingAnim = gSavedSettings.getBOOL("PlayTypingAnim"); 
+        mChatChannel = gSavedSettings.getBOOL("ChatChannelSelect");
         mConsoleOpacity = gSavedSettings.getF32("ConsoleBackgroundOpacity");
         mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
 }
 
-BOOL LLPrefsChatImpl::postBuild()
-{
-        childSetCommitCallback("toggle_channel_control",onCheckToggleChannel, this);
-
-        return TRUE;
-}
-
 void LLPrefsChatImpl::cancel()
 {
         gSavedSettings.setS32("ChatFontSize", mChatSize);
@@ -160,6 +153,7 @@ void LLPrefsChatImpl::cancel()
         gSavedSettings.setBOOL("ChatFullWidth", mChatFullWidth);
         gSavedSettings.setBOOL("CloseChatOnReturn", mCloseChatOnReturn);
         gSavedSettings.setBOOL("PlayTypingAnim", mPlayTypingAnim); 
+        gSavedSettings.setBOOL("ChatChannelSelect", mChatChannel); 
         gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
         gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);     
 }
@@ -192,18 +186,21 @@ void LLPrefsChatImpl::apply()
 
         gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
         gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
-}
 
-// static
-void LLPrefsChatImpl::onCheckToggleChannel(LLUICtrl* ctrl, void* user_data)
-{
-        if (gChatBar)
+        BOOL chan_check = childGetValue("toggle_channel_control");
+        gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
+        if (mChatChannel != chan_check)
         {
-                gChatBar->toggleChannelControl();
-                LLFloaterChat::toggleHistoryChannelControl();
+                if (gChatBar)
+                {
+                        gChatBar->toggleChannelControl();
+                        LLFloaterChat::toggleHistoryChannelControl();
+                }
+                mChatChannel = chan_check;
         }
 }
 
+
 //---------------------------------------------------------------------------
 
 LLPrefsChat::LLPrefsChat()
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
index 0704666..b0384cf 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_chat.xml
@@ -145,7 +145,7 @@
              label="Play typing animation when chatting" left="148" mouse_opaque="true"
              name="play_typing_animation" radio_style="false" width="237" />
   <check_box bottom_delta="-18" enabled="true" follows="left|top"
-             font="SansSerifSmall" height="16" initial_value="false" control_name="ChatChannelSelect"
+             font="SansSerifSmall" height="16" initial_value="false" 
        label="Show custom chat channel" left="148" mouse_opaque="true"
              name="toggle_channel_control" radio_style="false" width="237" />
         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"