1 files changed, 6 insertions, 14 deletions

diff --git a/linden/indra/newview/llchatbar.h b/linden/indra/newview/llchatbar.h
index 0f83d53..fd3b339 100644
--- a/linden/indra/newview/llchatbar.h
+++ b/linden/indra/newview/llchatbar.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -49,17 +49,12 @@ class LLChatBar
 {
 public:
         // constructor for inline chat-bars (e.g. hosted in chat history window)
-        LLChatBar(const std::string& name);
-        LLChatBar(const std::string& name, const LLRect& rect);
+        LLChatBar();
         ~LLChatBar();
         virtual BOOL postBuild();
 
-        virtual void reshape(S32 width, S32 height, BOOL called_from_parent);
         virtual BOOL handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
 
-        // Adjust buttons and input field for width
-        void            layout();
-
         void            refresh();
         void            refreshGestures();
 
@@ -86,20 +81,18 @@ public:
         LLWString stripChannelNumber(const LLWString &mesg, S32* channel);
 
         // callbacks
-        static void     onClickSay( void* userdata );
-        static void     onClickShout( void* userdata );
+        static void     onClickSay( LLUICtrl*, void* userdata );
 
         static void     onTabClick( void* userdata );
         static void     onInputEditorKeystroke(LLLineEditor* caller, void* userdata);
-        static void     onInputEditorFocusLost(LLUICtrl* caller,void* userdata);
-        static void     onInputEditorGainFocus(LLUICtrl* caller,void* userdata);
+        static void     onInputEditorFocusLost(LLFocusableElement* caller,void* userdata);
+        static void     onInputEditorGainFocus(LLFocusableElement* caller,void* userdata);
 
         static void onCommitGesture(LLUICtrl* ctrl, void* data);
 
         static void startChat(void*);
         static void stopChat();
 
-        /*virtual*/ void setVisible(BOOL visible);
 protected:
         void sendChat(EChatType type);
         void updateChat();
@@ -113,7 +106,6 @@ protected:
         S32                             mLastSpecialChatChannel;
 
         BOOL                    mIsBuilt;
-        BOOL                    mDynamicLayout;
         LLComboBox*             mGestureCombo;
 
         LLChatBarGestureObserver* mObserver;