1 files changed, 22 insertions, 1 deletions

diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index 4453751..82ae07c 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"
@@ -45,10 +47,13 @@ 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;
@@ -73,7 +78,6 @@ protected:
         F32     mBubbleOpacity;
 };
 
-
 LLPrefsChatImpl::LLPrefsChatImpl()
         :       LLPanel(std::string("Chat Panel"))
 {
@@ -128,6 +132,13 @@ LLPrefsChatImpl::LLPrefsChatImpl()
         mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
 }
 
+BOOL LLPrefsChatImpl::postBuild()
+{
+        childSetCommitCallback("toggle_channel_control",onCheckToggleChannel, this);
+
+        return TRUE;
+}
+
 void LLPrefsChatImpl::cancel()
 {
         gSavedSettings.setS32("ChatFontSize", mChatSize);
@@ -183,6 +194,16 @@ void LLPrefsChatImpl::apply()
         gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
 }
 
+// static
+void LLPrefsChatImpl::onCheckToggleChannel(LLUICtrl* ctrl, void* user_data)
+{
+        if (gChatBar)
+        {
+                gChatBar->toggleChannelControl();
+                LLFloaterChat::toggleHistoryChannelControl();
+        }
+}
+
 //---------------------------------------------------------------------------
 
 LLPrefsChat::LLPrefsChat()