Temporarily disable chat channel control in chat history until it's fixed

4 files changed, 11 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 3272dd6..f3fba08 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -14,6 +14,13 @@
         
                 modified:   linden/indra/newview/llworldmapview.cpp
                 
+        
+        * Temporarily disable chat channel control in chat history until it works right.
+        
+                modified:   linden/indra/newview/llchatbar.cpp
+                modified:   linden/indra/newview/llfloaterchat.cpp
+                modified:   linden/indra/newview/llprefschat.cpp
+
 
 2009-09-24 McCabe Maxsted  <hakushakukun@gmail.com>
 
diff --git a/linden/indra/newview/llchatbar.cpp b/linden/indra/newview/llchatbar.cpp
index 1de3690..46024ab 100644
--- a/linden/indra/newview/llchatbar.cpp
+++ b/linden/indra/newview/llchatbar.cpp
@@ -217,7 +217,7 @@ void LLChatBar::refresh()
 
         childSetValue("History", LLFloaterChat::instanceVisible(LLSD()));
 
-        childSetValue("channel_control",( 1.f * ((S32)(getChild<LLSpinCtrl>("channel_control")->get()))) );
+        //childSetValue("channel_control",( 1.f * ((S32)(getChild<LLSpinCtrl>("channel_control")->get()))) );
         childSetEnabled("Say", mInputEditor->getText().size() > 0);
         childSetEnabled("Shout", mInputEditor->getText().size() > 0);
 
diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 1f51a21..1f34ad0 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -108,6 +108,8 @@ LLFloaterChat::LLFloaterChat(const LLSD& seed)
         childSetVisible("Chat History Editor with mute",FALSE);
         childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
         setDefaultBtn("Chat");
+
+        //toggleHistoryChannelControl(); temporarily disable until working
 }
 
 LLFloaterChat::~LLFloaterChat()
diff --git a/linden/indra/newview/llprefschat.cpp b/linden/indra/newview/llprefschat.cpp
index f3b7278..6e55cda 100644
--- a/linden/indra/newview/llprefschat.cpp
+++ b/linden/indra/newview/llprefschat.cpp
@@ -194,7 +194,7 @@ void LLPrefsChatImpl::apply()
                 if (gChatBar)
                 {
                         gChatBar->toggleChannelControl();
-                        LLFloaterChat::toggleHistoryChannelControl();
+                        //LLFloaterChat::toggleHistoryChannelControl(); temporarily disable until working
                 }
                 mChatChannel = chan_check;
         }