1 files changed, 25 insertions, 26 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 513670b..f49b2db 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -103,9 +103,9 @@ BOOL LLTextCmd::hasExtCharValue( llwchar value )
 }
 
 // Utility funcs
-S32 LLTextCmd::insert(LLTextEditor* editor, S32 pos, const LLWString &utf8str)
+S32 LLTextCmd::insert(LLTextEditor* editor, S32 pos, const LLWString &wstr)
 {
-        return editor->insertStringNoUndo( pos, utf8str );
+        return editor->insertStringNoUndo( pos, wstr );
 }
 S32 LLTextCmd::remove(LLTextEditor* editor, S32 pos, S32 length)
 {
@@ -122,29 +122,29 @@ class LLTextCmdInsert : public LLTextCmd
 {
 public:
         LLTextCmdInsert(S32 pos, BOOL group_with_next, const LLWString &ws)
-                : LLTextCmd(pos, group_with_next), mString(ws)
+                : LLTextCmd(pos, group_with_next), mWString(ws)
         {
         }
         virtual BOOL execute( LLTextEditor* editor, S32* delta )
         {
-                *delta = insert(editor, mPos, mString );
-                LLWString::truncate(mString, *delta);
-                //mString = wstring_truncate(mString, *delta);
+                *delta = insert(editor, mPos, mWString );
+                LLWString::truncate(mWString, *delta);
+                //mWString = wstring_truncate(mWString, *delta);
                 return (*delta != 0);
         }       
         virtual S32 undo( LLTextEditor* editor )
         {
-                remove(editor, mPos, mString.length() );
+                remove(editor, mPos, mWString.length() );
                 return mPos;
         }
         virtual S32 redo( LLTextEditor* editor )
         {
-                insert(editor, mPos, mString );
-                return mPos + mString.length();
+                insert(editor, mPos, mWString );
+                return mPos + mWString.length();
         }
 
 private:
-        LLWString mString;
+        LLWString mWString;
 };
 
 ///////////////////////////////////////////////////////////////////
@@ -153,7 +153,7 @@ class LLTextCmdAddChar : public LLTextCmd
 {
 public:
         LLTextCmdAddChar( S32 pos, BOOL group_with_next, llwchar wc)
-                : LLTextCmd(pos, group_with_next), mString(1, wc), mBlockExtensions(FALSE)
+                : LLTextCmd(pos, group_with_next), mWString(1, wc), mBlockExtensions(FALSE)
         {
         }
         virtual void blockExtensions()
@@ -162,13 +162,13 @@ public:
         }
         virtual BOOL canExtend(S32 pos)
         {
-                return !mBlockExtensions && (pos == mPos + (S32)mString.length());
+                return !mBlockExtensions && (pos == mPos + (S32)mWString.length());
         }
         virtual BOOL execute( LLTextEditor* editor, S32* delta )
         {
-                *delta = insert(editor, mPos, mString);
-                LLWString::truncate(mString, *delta);
-                //mString = wstring_truncate(mString, *delta);
+                *delta = insert(editor, mPos, mWString);
+                LLWString::truncate(mWString, *delta);
+                //mWString = wstring_truncate(mWString, *delta);
                 return (*delta != 0);
         }
         virtual BOOL extendAndExecute( LLTextEditor* editor, S32 pos, llwchar wc, S32* delta )  
@@ -179,23 +179,23 @@ public:
                 *delta = insert(editor, pos, ws);
                 if( *delta > 0 )
                 {
-                        mString += wc;
+                        mWString += wc;
                 }
                 return (*delta != 0);
         }
         virtual S32 undo( LLTextEditor* editor )
         {
-                remove(editor, mPos, mString.length() );
+                remove(editor, mPos, mWString.length() );
                 return mPos;
         }
         virtual S32 redo( LLTextEditor* editor )
         {
-                insert(editor, mPos, mString );
-                return mPos + mString.length();
+                insert(editor, mPos, mWString );
+                return mPos + mWString.length();
         }
 
 private:
-        LLWString       mString;
+        LLWString       mWString;
         BOOL            mBlockExtensions;
 
 };
@@ -242,14 +242,14 @@ public:
         }
         virtual BOOL execute( LLTextEditor* editor, S32* delta )
         { 
-                mString = editor->getWSubString(mPos, mLen);
+                mWString = editor->getWSubString(mPos, mLen);
                 *delta = remove(editor, mPos, mLen );
                 return (*delta != 0);
         }
         virtual S32 undo( LLTextEditor* editor )
         {
-                insert(editor, mPos, mString );
-                return mPos + mString.length();
+                insert(editor, mPos, mWString );
+                return mPos + mWString.length();
         }
         virtual S32 redo( LLTextEditor* editor )
         {
@@ -257,7 +257,7 @@ public:
                 return mPos;
         }
 private:
-        LLWString       mString;
+        LLWString       mWString;
         S32                             mLen;
 };
 
@@ -3013,8 +3013,7 @@ void LLTextEditor::draw()
         if( getVisible() )
         {
                 {
-                        LLGLEnable scissor_test(GL_SCISSOR_TEST);
-                        LLUI::setScissorRegionLocal(LLRect(0, mRect.getHeight(), mRect.getWidth() - (mScrollbar->getVisible() ? SCROLLBAR_SIZE : 0), 0));
+                        LLLocalClipRect clip(LLRect(0, mRect.getHeight(), mRect.getWidth() - (mScrollbar->getVisible() ? SCROLLBAR_SIZE : 0), 0));
 
                         bindEmbeddedChars( mGLFont );