1 files changed, 12 insertions, 7 deletions

diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 04c53b4..2cd2ebf 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -2,6 +2,8 @@
  * @file lllineeditor.h
  * @brief LLLineEditor base class
  *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
  */
 
 // Text editor widget to let users enter/edit a single line.
@@ -133,11 +136,11 @@ public:
         // assumes UTF8 text
         virtual void    setValue(const LLSD& value );
         virtual LLSD    getValue() const;
-        virtual BOOL    setTextArg( const LLString& key, const LLString& text );
-        virtual BOOL    setLabelArg( const LLString& key, const LLString& text );
+        virtual BOOL    setTextArg( const LLString& key, const LLStringExplicit& text );
+        virtual BOOL    setLabelArg( const LLString& key, const LLStringExplicit& text );
 
-        void                    setLabel(const LLString &new_label);
-        void                    setText(const LLString &new_text);
+        void                    setLabel(const LLStringExplicit &new_label);
+        void                    setText(const LLStringExplicit &new_text);
 
         const LLString& getText() const         { return mText.getString(); }
         const LLWString& getWText() const       { return mText.getWString(); }
@@ -276,6 +279,8 @@ protected:
 
         S32                     mBorderThickness;
 
+        LLCoordGL       mLastIMEPosition;               // Last screen position used for the IME editor
+
         BOOL            mIgnoreArrowKeys;
         BOOL            mIgnoreTab;
         BOOL            mDrawAsterixes;
@@ -307,15 +312,15 @@ public:
         virtual LLString getWidgetTag() const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
 
-        void setText(const LLString &new_text);
+        void setText(const LLStringExplicit &new_text);
 
         void setSearchCallback(void (*search_callback)(const LLString& search_string, void* user_data), void* data) { mSearchCallback = search_callback; mCallbackUserData = data; }
 
         // LLUICtrl interface
         virtual void    setValue(const LLSD& value );
         virtual LLSD    getValue() const;
-        virtual BOOL    setTextArg( const LLString& key, const LLString& text );
-        virtual BOOL    setLabelArg( const LLString& key, const LLString& text );
+        virtual BOOL    setTextArg( const LLString& key, const LLStringExplicit& text );
+        virtual BOOL    setLabelArg( const LLString& key, const LLStringExplicit& text );
         virtual void    clear();