1 files changed, 15 insertions, 5 deletions

diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 3cff91d..3604cf6 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -245,9 +245,11 @@ public:
         llwchar                 getWChar(S32 pos) const { return mWText[pos]; }
         LLWString               getWSubString(S32 pos, S32 len) const { return mWText.substr(pos, len); }
         
-        const LLTextSegment*    getCurrentSegment() { return getSegmentAtOffset(mCursorPos); }
-        const LLTextSegment*    getPreviousSegment();
-        void getSelectedSegments(std::vector<const LLTextSegment*>& segments);
+        const LLTextSegment*    getCurrentSegment() const { return getSegmentAtOffset(mCursorPos); }
+        const LLTextSegment*    getPreviousSegment() const;
+        void getSelectedSegments(std::vector<const LLTextSegment*>& segments) const;
+
+        static bool             isPartOfWord(llwchar c) { return (c == '_') || LLStringOps::isAlnum((char)c); }
 
 protected:
         //
@@ -266,8 +268,6 @@ protected:
         void                    assignEmbedded(const std::string &s);
         BOOL                    truncate();                             // Returns true if truncation occurs
         
-        static BOOL             isPartOfWord(llwchar c) { return (c == '_') || isalnum(c); }
-
         void                    removeCharOrTab();
         void                    setCursorAtLocalPos(S32 x, S32 y, BOOL round);
         S32                             getCursorPosFromLocalCoord( S32 local_x, S32 local_y, BOOL round ) const;
@@ -433,6 +433,14 @@ private:
         void                    drawText();
         void                    drawClippedSegment(const LLWString &wtext, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyleSP& color, F32* right_x);
 
+        void                    needsReflow() 
+        { 
+                mReflowNeeded = TRUE; 
+                // cursor might have moved, need to scroll
+                mScrollNeeded = TRUE;
+        }
+        void                    needsScroll() { mScrollNeeded = TRUE; }
+
         //
         // Data
         //
@@ -489,6 +497,8 @@ private:
         };
         typedef std::vector<line_info> line_list_t;
         line_list_t mLineStartList;
+        BOOL                    mReflowNeeded;
+        BOOL                    mScrollNeeded;
 
         LLFrameTimer    mKeystrokeTimer;