Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

1 files changed, 2 insertions, 3 deletions

diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 6738151..11cbcd9 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -13,7 +13,7 @@
  *
  * $LicenseInfo:firstyear=2001&license=viewergpl$
  * 
- * Copyright (c) 2001-2008, Linden Research, Inc.
+ * Copyright (c) 2001-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -82,7 +82,7 @@ public:
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
         void setColorParameters(LLXMLNodePtr node);
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
-        static void cleanupClass();
+        static void cleanupLineEditor();
 
         // mousehandler overrides
         /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask);
@@ -195,7 +195,6 @@ public:
         void                    setMaxTextLength(S32 max_text_length);
         void                    setTextPadding(S32 left, S32 right); // Used to specify room for children before or after text.
 
-        static BOOL             isPartOfWord(llwchar c);
         // Prevalidation controls which keystrokes can affect the editor
         void                    setPrevalidate( BOOL (*func)(const LLWString &) );
         static BOOL             prevalidateFloat(const LLWString &str );