Merge remote branch 'mccabe/1.2.0-next' into next

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 53ac233..96961ae 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -43,6 +43,7 @@ class LLUUID;
 class LLFrameTimer;
 class LLChatBarGestureObserver;
 class LLComboBox;
+class LLSpinCtrl;
 
 class LLChatBar
 :       public LLPanel
@@ -113,7 +114,8 @@ protected:
         LLChatBarGestureObserver* mObserver;
 
 private:
-        BOOL                            mChannelControl;
+        BOOL                            mChanCtrlEnabled;
+        LLSpinCtrl*                     mChannelControl;
 };
 
 extern LLChatBar *gChatBar;