1 files changed, 19 insertions, 1 deletions

diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 4453751..f3b7278 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -32,6 +32,8 @@
 
 #include "llviewerprecompiledheaders.h"
 
+#include "llchatbar.h"
+#include "llfloaterchat.h"
 #include "llprefschat.h"
 #include "lltexteditor.h"
 #include "llviewercontrol.h"
@@ -69,11 +71,11 @@ protected:
         BOOL mPlayTypingAnim;
         BOOL mChatBubbles;
         BOOL mScriptErrorAsChat;
+        BOOL mChatChannel;
         F32     mConsoleOpacity;
         F32     mBubbleOpacity;
 };
 
-
 LLPrefsChatImpl::LLPrefsChatImpl()
         :       LLPanel(std::string("Chat Panel"))
 {
@@ -101,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"));
 
@@ -124,6 +127,7 @@ 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");
 }
@@ -149,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);     
 }
@@ -181,8 +186,21 @@ void LLPrefsChatImpl::apply()
 
         gSavedSettings.setF32("ConsoleBackgroundOpacity", childGetValue("console_opacity").asReal());
         gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
+
+        BOOL chan_check = childGetValue("toggle_channel_control");
+        gSavedSettings.setBOOL("ChatChannelSelect", chan_check);
+        if (mChatChannel != chan_check)
+        {
+                if (gChatBar)
+                {
+                        gChatBar->toggleChannelControl();
+                        LLFloaterChat::toggleHistoryChannelControl();
+                }
+                mChatChannel = chan_check;
+        }
 }
 
+
 //---------------------------------------------------------------------------
 
 LLPrefsChat::LLPrefsChat()