Merged working branch of 1.2 into LL 1.23 merge

1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 56a98a7..13332c7 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -44,6 +44,7 @@ class LLUUID;
 class LLFrameTimer;
 class LLChatBarGestureObserver;
 class LLComboBox;
+class LLSpinCtrl;
 
 class LLChatBar
 :       public LLPanel
@@ -94,6 +95,8 @@ public:
         static void startChat(const char* line);
         static void stopChat();
 
+        void toggleChannelControl();
+
 protected:
         void sendChat(EChatType type);
         void updateChat();
@@ -110,6 +113,10 @@ protected:
         LLComboBox*             mGestureCombo;
 
         LLChatBarGestureObserver* mObserver;
+
+private:
+        BOOL                            mChanCtrlEnabled;
+        LLSpinCtrl*                     mChannelControl;
 };
 
 extern LLChatBar *gChatBar;