13 files changed, 179 insertions, 152 deletions

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 9f8cd65..047342f 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -127,6 +127,7 @@ LLFloaterView* gFloaterView = NULL;
 
 LLFloater::LLFloater() :
         //FIXME: we should initialize *all* member variables here
+        LLPanel(), mAutoFocus(TRUE),
         mResizable(FALSE),
         mDragOnLeft(FALSE),
         mMinWidth(0),
@@ -139,6 +140,11 @@ LLFloater::LLFloater() :
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
+        for (S32 i = 0; i < 4; i++) 
+        {
+                mResizeBar[i] = NULL; 
+                mResizeHandle[i] = NULL;
+        }
         mDragHandle = NULL;
         mHandle.bind(this);
 }
@@ -151,6 +157,11 @@ LLFloater::LLFloater(const std::string& name)
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
+        for (S32 i = 0; i < 4; i++) 
+        {
+                mResizeBar[i] = NULL; 
+                mResizeHandle[i] = NULL;
+        }
         std::string title; // null string
         initFloater(title, FALSE, DEFAULT_MIN_WIDTH, DEFAULT_MIN_HEIGHT, FALSE, TRUE, TRUE); // defaults
 }
@@ -171,6 +182,11 @@ LLFloater::LLFloater(const std::string& name, const LLRect& rect, const std::str
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
+        for (S32 i = 0; i < 4; i++) 
+        {
+                mResizeBar[i] = NULL; 
+                mResizeHandle[i] = NULL;
+        }
         initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
 }
 
@@ -189,6 +205,11 @@ LLFloater::LLFloater(const std::string& name, const std::string& rect_control, c
                 mButtonsEnabled[i] = FALSE;
                 mButtons[i] = NULL;
         }
+        for (S32 i = 0; i < 4; i++) 
+        {
+                mResizeBar[i] = NULL; 
+                mResizeHandle[i] = NULL;
+        }
         initFloater( title, resizable, min_width, min_height, drag_on_left, minimizable, close_btn);
 }
 
@@ -1580,6 +1601,7 @@ void LLFloater::updateButtons()
         S32 button_count = 0;
         for (S32 i = 0; i < BUTTON_COUNT; i++)
         {
+                if(!mButtons[i]) continue;
                 mButtons[i]->setEnabled(mButtonsEnabled[i]);
 
                 if (mButtonsEnabled[i] 
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 12d1929..a0af463 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -35,6 +35,7 @@
  
 #include "lllineeditor.h"
 
+#include "lltexteditor.h"
 #include "audioengine.h"
 #include "llmath.h"
 #include "llfontgl.h"
@@ -450,19 +451,19 @@ BOOL LLLineEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
                 BOOL doSelectAll = TRUE;
 
                 // Select the word we're on
-                if( isPartOfWord( wtext[mCursorPos] ) )
+                if( LLTextEditor::isPartOfWord( wtext[mCursorPos] ) )
                 {
                         S32 old_selection_start = mLastSelectionStart;
                         S32 old_selection_end = mLastSelectionEnd;
 
                         // Select word the cursor is over
-                        while ((mCursorPos > 0) && isPartOfWord( wtext[mCursorPos-1] ))
+                        while ((mCursorPos > 0) && LLTextEditor::isPartOfWord( wtext[mCursorPos-1] ))
                         {       // Find the start of the word
                                 mCursorPos--;
                         }
                         startSelection();       
 
-                        while ((mCursorPos < (S32)wtext.length()) && isPartOfWord( wtext[mCursorPos] ) )
+                        while ((mCursorPos < (S32)wtext.length()) && LLTextEditor::isPartOfWord( wtext[mCursorPos] ) )
                         {       // Find the end of the word
                                 mCursorPos++;
                         }
@@ -764,7 +765,7 @@ S32 LLLineEditor::prevWordPos(S32 cursorPos) const
         {
                 cursorPos--;
         }
-        while( (cursorPos > 0) && isPartOfWord( wtext[cursorPos-1] ) )
+        while( (cursorPos > 0) && LLTextEditor::isPartOfWord( wtext[cursorPos-1] ) )
         {
                 cursorPos--;
         }
@@ -774,7 +775,7 @@ S32 LLLineEditor::prevWordPos(S32 cursorPos) const
 S32 LLLineEditor::nextWordPos(S32 cursorPos) const
 {
         const LLWString& wtext = mText.getWString();
-        while( (cursorPos < getLength()) && isPartOfWord( wtext[cursorPos] ) )
+        while( (cursorPos < getLength()) && LLTextEditor::isPartOfWord( wtext[cursorPos] ) )
         {
                 cursorPos++;
         } 
@@ -1422,7 +1423,7 @@ void LLLineEditor::draw()
 #else // the old programmer art.
         // drawing solids requires texturing be disabled
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 // draw background for text
                 if( !mReadOnly )
                 {
@@ -1817,9 +1818,6 @@ BOOL LLLineEditor::prevalidateFloat(const LLWString &str)
         return success;
 }
 
-//static
-BOOL LLLineEditor::isPartOfWord(llwchar c) { return (c == '_') || isalnum(c); }
-
 // static
 BOOL LLLineEditor::postvalidateFloat(const std::string &str)
 {
@@ -1993,7 +1991,7 @@ BOOL LLLineEditor::prevalidateAlphaNum(const LLWString &str)
         if(len == 0) return rv;
         while(len--)
         {
-                if( !isalnum(str[len]) )
+                if( !LLStringOps::isAlnum((char)str[len]) )
                 {
                         rv = FALSE;
                         break;
@@ -2012,7 +2010,7 @@ BOOL LLLineEditor::prevalidateAlphaNumSpace(const LLWString &str)
         if(len == 0) return rv;
         while(len--)
         {
-                if(!(isalnum(str[len]) || (' ' == str[len])))
+                if(!(LLStringOps::isAlnum((char)str[len]) || (' ' == str[len])))
                 {
                         rv = FALSE;
                         break;
@@ -2034,7 +2032,7 @@ BOOL LLLineEditor::prevalidatePrintableNotPipe(const LLWString &str)
                         rv = FALSE;
                         break;
                 }
-                if(!((' ' == str[len]) || isalnum(str[len]) || ispunct(str[len])))
+                if(!((' ' == str[len]) || LLStringOps::isAlnum((char)str[len]) || LLStringOps::isPunct((char)str[len])))
                 {
                         rv = FALSE;
                         break;
@@ -2052,12 +2050,13 @@ BOOL LLLineEditor::prevalidatePrintableNoSpace(const LLWString &str)
         if(len == 0) return rv;
         while(len--)
         {
-                if(iswspace(str[len]))
+                if(LLStringOps::isSpace(str[len]))
                 {
                         rv = FALSE;
                         break;
                 }
-                if( !(isalnum(str[len]) || ispunct(str[len]) ) )
+                if( !(LLStringOps::isAlnum((char)str[len]) ||
+                      LLStringOps::isPunct((char)str[len]) ) )
                 {
                         rv = FALSE;
                         break;
@@ -2282,7 +2281,7 @@ LLView* LLLineEditor::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory
 }
 
 //static
-void LLLineEditor::cleanupClass()
+void LLLineEditor::cleanupLineEditor()
 {
         sImage = NULL;
 }
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index 09a240b..bc9e406 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -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);
@@ -194,7 +194,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 );
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 24cc47e..4766267 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -1309,6 +1309,7 @@ void LLMenuItemBranchGL::openMenu()
                 }
                 mBranch->translate( delta_x, delta_y );
                 mBranch->setVisible( TRUE );
+                mBranch->getParent()->sendChildToFront(mBranch);
         }
 }
 
@@ -1427,6 +1428,7 @@ void LLMenuItemBranchDownGL::openMenu( void )
 
                         setHighlight(TRUE);
                         branch->setVisible( TRUE );
+                        branch->getParent()->sendChildToFront(branch);
                 }
         }
 }
@@ -2958,6 +2960,7 @@ void LLMenuGL::showPopup(LLView* spawning_view, LLMenuGL* menu, S32 x, S32 y)
         }
         menu->translate( delta_x, delta_y );
         menu->setVisible( TRUE );
+        menu->getParent()->sendChildToFront(menu);
 }
 
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/llui/llmultislider.cpp b/linden/indra/llui/llmultislider.cpp
index 227cf98..11c2cba 100644
--- a/linden/indra/llui/llmultislider.cpp
+++ b/linden/indra/llui/llmultislider.cpp
@@ -431,7 +431,7 @@ void LLMultiSlider::draw()
         // Draw background and thumb.
 
         // drawing solids requires texturing be disabled
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         LLRect rect(mDragStartThumbRect);
 
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index 1ba2923..51face6 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -425,7 +425,7 @@ void LLScrollableContainerView::draw()
         // Draw background
         if( mIsOpaque )
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( mBackgroundColor.mV );
                 gl_rect_2d( mInnerRect );
         }
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index d342378..92bcb88 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -435,7 +435,7 @@ void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const
         // draw background rect
         LLRect bg_rect = rect;
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv(bg_color.mV);
                 gl_rect_2d( bg_rect );
         }
@@ -1758,7 +1758,7 @@ void LLScrollListCtrl::draw()
         // Draw background
         if (mBackgroundVisible)
         {
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.color4fv( getEnabled() ? mBgWriteableColor.mV : mBgReadOnlyColor.mV );
                 gl_rect_2d(background);
         }
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 4cc558f..b2438af 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -253,7 +253,7 @@ void LLSlider::draw()
         // Draw background and thumb.
 
         // drawing solids requires texturing be disabled
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         F32 opacity = getEnabled() ? 1.f : 0.3f;
         LLColor4 center_color = (mThumbCenterColor % opacity);
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index e56002f..281dbe4 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -260,7 +260,7 @@ LLTextEditor::LLTextEditor(
         mIsSelecting( FALSE ),
         mSelectionStart( 0 ),
         mSelectionEnd( 0 ),
-        mScrolledToBottom( FALSE ),
+        mScrolledToBottom( TRUE ),
         mOnScrollEndCallback( NULL ),
         mOnScrollEndData( NULL ),
         mCursorColor(           LLUI::sColorsGroup->getColor( "TextCursorColor" ) ),
@@ -277,14 +277,16 @@ LLTextEditor::LLTextEditor(
         mCommitOnFocusLost( FALSE ),
         mHideScrollbarForShortDocs( FALSE ),
         mTakesNonScrollClicks( TRUE ),
-        mTrackBottom( TRUE ),
+        mTrackBottom( FALSE ),
         mAllowEmbeddedItems( allow_embedded_items ),
         mAcceptCallingCardNames(FALSE),
         mHandleEditKeysDirectly( FALSE ),
         mMouseDownX(0),
         mMouseDownY(0),
         mLastSelectionX(-1),
-        mLastSelectionY(-1)
+        mLastSelectionY(-1),
+        mReflowNeeded(FALSE),
+        mScrollNeeded(FALSE)
 {
         mSourceID.generate();
 
@@ -468,6 +470,13 @@ void LLTextEditor::updateLineStartList(S32 startpos)
                 mScrollbar->setVisible(!short_doc);
         }
 
+        // if scrolled to bottom, stay at bottom
+        // unless user is editing text
+        // do this after updating page size
+        if (mScrolledToBottom && mTrackBottom && !hasFocus())
+        {
+                endOfDoc();
+        }
 }
 
 ////////////////////////////////////////////////////////////
@@ -511,8 +520,7 @@ void LLTextEditor::setText(const LLStringExplicit &utf8str)
         setCursorPos(0);
         deselect();
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 
         resetDirty();
 }
@@ -529,8 +537,7 @@ void LLTextEditor::setWText(const LLWString &wtext)
         setCursorPos(0);
         deselect();
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 
         resetDirty();
 }
@@ -568,8 +575,7 @@ void LLTextEditor::setWordWrap(BOOL b)
         setCursorPos(0);
         deselect();
         
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 }
 
 
@@ -734,6 +740,7 @@ S32 LLTextEditor::getLineStart( S32 line ) const
     {
                 return 0;
     }
+
         line = llclamp(line, 0, num_lines-1);
         S32 segidx = mLineStartList[line].mSegment;
         S32 segoffset = mLineStartList[line].mOffset;
@@ -781,14 +788,14 @@ void LLTextEditor::getSegmentAndOffset( S32 startpos, S32* segidxp, S32* offsetp
         *offsetp = startpos - (*seg_iter)->getStart();
 }
 
-const LLTextSegment*    LLTextEditor::getPreviousSegment()
+const LLTextSegment*    LLTextEditor::getPreviousSegment() const
 {
         // find segment index at character to left of cursor (or rightmost edge of selection)
         S32 idx = llmax(0, getSegmentIdxAtOffset(mCursorPos) - 1);
         return idx >= 0 ? mSegments[idx] : NULL;
 }
 
-void LLTextEditor::getSelectedSegments(std::vector<const LLTextSegment*>& segments)
+void LLTextEditor::getSelectedSegments(std::vector<const LLTextSegment*>& segments) const
 {
         S32 left = hasSelection() ? llmin(mSelectionStart, mSelectionEnd) : mCursorPos;
         S32 right = hasSelection() ? llmax(mSelectionStart, mSelectionEnd) : mCursorPos;
@@ -875,13 +882,12 @@ void LLTextEditor::setCursor(S32 row, S32 column)
         }
         doc += column;
         setCursorPos(doc - mWText.c_str());
-        updateScrollFromCursor();
 }
 
 void LLTextEditor::setCursorPos(S32 offset)
 {
         mCursorPos = llclamp(offset, 0, (S32)getLength());
-        updateScrollFromCursor();
+        needsScroll();
         // reset desired x cursor position
         mDesiredXPixel = -1;
 }
@@ -1222,8 +1228,6 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
 
                         setCursorAtLocalPos( x, y, TRUE );
                         mSelectionEnd = mCursorPos;
-                        
-                        updateScrollFromCursor();
                 }
 
                 lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (active)" << llendl;               
@@ -1317,8 +1321,6 @@ BOOL LLTextEditor::handleMouseUp(S32 x, S32 y, MASK mask)
                         
                         setCursorAtLocalPos( x, y, TRUE );
                         endSelection();
-
-                        updateScrollFromCursor();
                 }
                 
                 if( !hasSelection() )
@@ -1839,8 +1841,7 @@ void LLTextEditor::cut()
         gClipboard.copyFromSubstring( mWText, left_pos, length, mSourceID );
         deleteSelection( FALSE );
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 }
 
 BOOL LLTextEditor::canCopy() const
@@ -1910,8 +1911,7 @@ void LLTextEditor::paste()
         setCursorPos(mCursorPos + insert(mCursorPos, clean_string, FALSE));
         deselect();
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 }
 
 
@@ -2235,9 +2235,9 @@ BOOL LLTextEditor::handleKeyHere(KEY key, MASK mask )
 
                         if(text_may_have_changed)
                         {
-                                updateLineStartList();
+                                needsReflow();
                         }
-                        updateScrollFromCursor();
+                        needsScroll();
                 }
         }
 
@@ -2280,8 +2280,7 @@ BOOL LLTextEditor::handleUnicodeCharHere(llwchar uni_char)
                         // Most keystrokes will make the selection box go away, but not all will.
                         deselect();
 
-                        updateLineStartList();
-                        updateScrollFromCursor();
+                        needsReflow();
                 }
         }
 
@@ -2339,8 +2338,7 @@ void LLTextEditor::doDelete()
                 }
         }
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 }
 
 //----------------------------------------------------------------------------
@@ -2383,8 +2381,7 @@ void LLTextEditor::undo()
 
                 setCursorPos(pos);
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 }
 
 BOOL LLTextEditor::canRedo() const
@@ -2426,8 +2423,7 @@ void LLTextEditor::redo()
                 
                 setCursorPos(pos);
 
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 }
 
 void LLTextEditor::onFocusReceived()
@@ -2594,7 +2590,7 @@ void LLTextEditor::drawSelectionBackground()
                 BOOL selection_visible = (left_visible_pos <= selection_right) && (selection_left <= right_visible_pos);
                 if( selection_visible )
                 {
-                        LLGLSNoTexture no_texture;
+                        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                         const LLColor4& color = mReadOnly ? mReadOnlyBgColor : mWriteableBgColor;
                         F32 alpha = hasFocus() ? 1.f : 0.5f;
                         gGL.color4f( 1.f - color.mV[0], 1.f - color.mV[1], 1.f - color.mV[2], alpha );
@@ -2729,7 +2725,7 @@ void LLTextEditor::drawCursor()
                                         }
                                 }
                                 
-                                LLGLSNoTexture no_texture;
+                                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                                 gGL.color4fv( mCursorColor.mV );
                                 
@@ -3100,6 +3096,20 @@ void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32
 
 void LLTextEditor::draw()
 {
+        // do on-demand reflow 
+        if (mReflowNeeded)
+        {
+                updateLineStartList();
+                mReflowNeeded = FALSE;
+        }
+
+        // then update scroll position, as cursor may have moved
+        if (mScrollNeeded)
+        {
+                updateScrollFromCursor();
+                mScrollNeeded = FALSE; 
+        }
+
         {
                 LLLocalClipRect clip(LLRect(0, getRect().getHeight(), getRect().getWidth() - (mScrollbar->getVisible() ? SCROLLBAR_SIZE : 0), 0));
 
@@ -3118,10 +3128,10 @@ void LLTextEditor::draw()
                 mBorder->setKeyboardFocusHighlight( gFocusMgr.getKeyboardFocus() == this);// && !mReadOnly);
         }
         
+        LLView::draw();  // Draw children (scrollbar and border)
+
         // remember if we are supposed to be at the bottom of the buffer
         mScrolledToBottom = isScrolledToBottom();
-
-        LLView::draw();  // Draw children (scrollbar and border)
 }
 
 
@@ -3311,7 +3321,7 @@ void LLTextEditor::setCursorAndScrollToEnd()
 {
         deselect();
         endOfDoc();
-        updateScrollFromCursor();
+        needsScroll();
 }
 
 void LLTextEditor::getLineAndColumnForPosition( S32 position, S32* line, S32* col, BOOL include_wordwrap )
@@ -3438,7 +3448,7 @@ void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
         // up-to-date mTextRect
         updateTextRect();
         
-        updateLineStartList();
+        needsReflow();
 
         // propagate shape information to scrollbar
         mScrollbar->setDocSize( getLineCount() );
@@ -3446,14 +3456,6 @@ void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
         S32 line_height = llround( mGLFont->getLineHeight() );
         S32 page_lines = mTextRect.getHeight() / line_height;
         mScrollbar->setPageSize( page_lines );
-
-        // if scrolled to bottom, stay at bottom
-        // unless user is editing text
-        // do this after updating page size
-        if (mScrolledToBottom && mTrackBottom && !hasFocus())
-        {
-                endOfDoc();
-        }
 }
 
 void LLTextEditor::autoIndent()
@@ -3500,8 +3502,7 @@ void LLTextEditor::insertText(const std::string &new_text)
 
         setCursorPos(mCursorPos + insert( mCursorPos, utf8str_to_wstring(new_text), FALSE ));
         
-        updateLineStartList();
-        updateScrollFromCursor();
+        needsReflow();
 
         setEnabled( enabled );
 }
@@ -3600,7 +3601,7 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
                 mSegments.push_back(segment);
         }
         
-        updateLineStartList(old_length);
+        needsReflow();
         
         // Set the cursor and scroll position
         // Maintain the scroll position unless the scroll was at the end of the doc (in which 
@@ -3639,14 +3640,6 @@ void LLTextEditor::appendText(const std::string &new_text, bool allow_undo, bool
         {
                 blockUndo();
         }
-
-        // if scrolled to bottom, stay at bottom
-        // unless user is editing text
-        // do this after updating page size
-        if (mScrolledToBottom && mTrackBottom && !hasFocus())
-        {
-                endOfDoc();
-        }
 }
 
 void LLTextEditor::removeTextFromEnd(S32 num_chars)
@@ -3661,7 +3654,10 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars)
         mSelectionEnd = llclamp(mSelectionEnd, 0, len);
 
         pruneSegments();
+        
+        // pruneSegments will invalidate mLineStartList.
         updateLineStartList();
+        needsScroll();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -3759,8 +3755,7 @@ BOOL LLTextEditor::tryToRevertToPristineState()
                         }
                 }
 
-                updateLineStartList();
-                updateScrollFromCursor();
+                needsReflow();
         }
 
         return isPristine(); // TRUE => success
@@ -3808,6 +3803,7 @@ void LLTextEditor::updateSegments()
         {
                 findEmbeddedItemSegments();
         }
+
         // Make sure we have at least one segment
         if (mSegments.size() == 1 && mSegments[0]->getIsDefault())
         {
@@ -3824,6 +3820,7 @@ void LLTextEditor::updateSegments()
 }
 
 // Only effective if text was removed from the end of the editor
+// *NOTE: Using this will invalidate references to mSegments from mLineStartList.
 void LLTextEditor::pruneSegments()
 {
         S32 len = mWText.length();
@@ -4066,9 +4063,7 @@ BOOL LLTextEditor::importBuffer(const char* buffer, S32 length )
         setCursorPos(0);
         deselect();
 
-        updateLineStartList();
-        updateScrollFromCursor();
-
+        needsReflow();
         return success;
 }
 
@@ -4260,35 +4255,35 @@ S32 LLTextEditor::findHTMLToken(const std::string &line, S32 pos, BOOL reverse)
         std::string openers=" \t\n('\"[{<>";
         std::string closers=" \t\n)'\"]}><;";
 
-        S32 m2 = 0;
-        S32 retval = 0;
+        S32 index = 0;
         
         if (reverse)
         {
-                
-                for (retval=pos; retval >= 0; retval--)
+                for (index=pos; index >= 0; index--)
                 {
-                        m2 = openers.find(line.substr(retval,1));
+                        char c = line[index];
+                        S32 m2 = openers.find(c);
                         if (m2 >= 0)
                         {
-                                break;
+                                return index+1;
                         }
                 }
-                return retval+1;
         } 
         else
         {
                 
-                for (retval=pos; retval<(S32)line.length(); retval++)
+                for (index=pos; index<(S32)line.length(); index++)
                 {
-                        m2 = closers.find(line.substr(retval,1));
+                        char c = line[index];
+                        S32 m2 = closers.find(c);
                         if (m2 >= 0)
                         {
-                                break;
+                                return index;
                         }
                 } 
-                return retval;
-        }
+        }               
+        
+        return index;
 }
 
 BOOL LLTextEditor::findHTML(const std::string &line, S32 *begin, S32 *end) const
@@ -4476,9 +4471,8 @@ void LLTextEditor::updatePreedit(const LLWString &preedit_string,
 
         mPreeditStandouts = preedit_standouts;
 
-        updateLineStartList();
+        needsReflow();
         setCursorPos(insert_preedit_at + caret_position);
-        // updateScrollFromCursor();
 
         // Update of the preedit should be caused by some key strokes.
         mKeystrokeTimer.reset();
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;
 
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 734aecf..5502246 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -143,11 +143,11 @@ void gl_state_for_2d(S32 width, S32 height)
 
 void gl_draw_x(const LLRect& rect, const LLColor4& color)
 {
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         gGL.color4fv( color.mV );
 
-        gGL.begin( LLVertexBuffer::LINES );
+        gGL.begin( LLRender::LINES );
                 gGL.vertex2i( rect.mLeft,               rect.mTop );
                 gGL.vertex2i( rect.mRight,      rect.mBottom );
                 gGL.vertex2i( rect.mLeft,               rect.mBottom );
@@ -183,12 +183,12 @@ void gl_rect_2d_offset_local( S32 left, S32 top, S32 right, S32 bottom, S32 pixe
 void gl_rect_2d(S32 left, S32 top, S32 right, S32 bottom, BOOL filled )
 {
         stop_glerror();
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         // Counterclockwise quad will face the viewer
         if( filled )
         {
-                gGL.begin( LLVertexBuffer::QUADS );
+                gGL.begin( LLRender::QUADS );
                         gGL.vertex2i(left, top);
                         gGL.vertex2i(left, bottom);
                         gGL.vertex2i(right, bottom);
@@ -200,7 +200,7 @@ void gl_rect_2d(S32 left, S32 top, S32 right, S32 bottom, BOOL filled )
                 if( gGLManager.mATIOffsetVerticalLines )
                 {
                         // Work around bug in ATI driver: vertical lines are offset by (-1,-1)
-                        gGL.begin( LLVertexBuffer::LINES );
+                        gGL.begin( LLRender::LINES );
 
                                 // Verticals 
                                 gGL.vertex2i(left + 1, top);
@@ -223,7 +223,7 @@ void gl_rect_2d(S32 left, S32 top, S32 right, S32 bottom, BOOL filled )
                 {
                         top--;
                         right--;
-                        gGL.begin( LLVertexBuffer::LINE_STRIP );
+                        gGL.begin( LLRender::LINE_STRIP );
                                 gGL.vertex2i(left, top);
                                 gGL.vertex2i(left, bottom);
                                 gGL.vertex2i(right, bottom);
@@ -254,7 +254,7 @@ void gl_rect_2d( const LLRect& rect, const LLColor4& color, BOOL filled )
 void gl_drop_shadow(S32 left, S32 top, S32 right, S32 bottom, const LLColor4 &start_color, S32 lines)
 {
         stop_glerror();
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
         // HACK: Overlap with the rectangle by a single pixel.
         right--;
@@ -264,7 +264,7 @@ void gl_drop_shadow(S32 left, S32 top, S32 right, S32 bottom, const LLColor4 &st
         LLColor4 end_color = start_color;
         end_color.mV[VALPHA] = 0.f;
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
 
         // Right edge, CCW faces screen
         gGL.color4fv(start_color.mV);
@@ -324,9 +324,9 @@ void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2 )
                 y2++;
         }
 
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
                 gGL.vertex2i(x1, y1);
                 gGL.vertex2i(x2, y2);
         gGL.end();
@@ -343,11 +343,11 @@ void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2, const LLColor4 &color )
                 y2++;
         }
 
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         gGL.color4fv( color.mV );
 
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
                 gGL.vertex2i(x1, y1);
                 gGL.vertex2i(x2, y2);
         gGL.end();
@@ -355,17 +355,17 @@ void gl_line_2d(S32 x1, S32 y1, S32 x2, S32 y2, const LLColor4 &color )
 
 void gl_triangle_2d(S32 x1, S32 y1, S32 x2, S32 y2, S32 x3, S32 y3, const LLColor4& color, BOOL filled)
 {
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         gGL.color4fv(color.mV);
 
         if (filled)
         {
-                gGL.begin(LLVertexBuffer::TRIANGLES);
+                gGL.begin(LLRender::TRIANGLES);
         }
         else
         {
-                gGL.begin(LLVertexBuffer::LINE_LOOP);
+                gGL.begin(LLRender::LINE_LOOP);
         }
         gGL.vertex2i(x1, y1);
         gGL.vertex2i(x2, y2);
@@ -375,11 +375,11 @@ void gl_triangle_2d(S32 x1, S32 y1, S32 x2, S32 y2, S32 x3, S32 y3, const LLColo
 
 void gl_corners_2d(S32 left, S32 top, S32 right, S32 bottom, S32 length, F32 max_frac)
 {
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         length = llmin((S32)(max_frac*(right - left)), length);
         length = llmin((S32)(max_frac*(top - bottom)), length);
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
         gGL.vertex2i(left, top);
         gGL.vertex2i(left + length, top);
         
@@ -496,11 +496,11 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLIma
         {
                 gGL.translatef((F32)x, (F32)y, 0.f);
 
-                image->bind();
+                gGL.getTexUnit(0)->bind(image);
 
                 gGL.color4fv(color.mV);
                 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         // draw bottom left
                         gGL.texCoord2f(uv_rect.mLeft, uv_rect.mBottom);
@@ -656,11 +656,11 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
                         gGL.translatef( -offset_x, -offset_y, 0.f );
                 }
 
-                image->bind();
+                gGL.getTexUnit(0)->bind(image);
 
                 gGL.color4fv(color.mV);
                 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         gGL.texCoord2f(uv_rect.mRight, uv_rect.mTop);
                         gGL.vertex2i(width, height );
@@ -694,11 +694,11 @@ void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageG
         {
                 gGL.translatef((F32)x, (F32)y, 0.f);
 
-                image->bind();
+                gGL.getTexUnit(0)->bind(image);
 
                 gGL.color4fv(color.mV);
                 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         gGL.texCoord2f(uv_rect.mRight, uv_rect.mBottom);
                         gGL.vertex2i(width, height );
@@ -733,7 +733,7 @@ void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LL
         glLineWidth(2.5f);
         glLineStipple(2, 0x3333 << shift);
 
-        gGL.begin(LLVertexBuffer::LINES);
+        gGL.begin(LLRender::LINES);
         {
                 gGL.vertex3fv( start.mV );
                 gGL.vertex3fv( end.mV );
@@ -750,7 +750,7 @@ void gl_rect_2d_xor(S32 left, S32 top, S32 right, S32 bottom)
         glLogicOp( GL_XOR );
         stop_glerror();
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
                 gGL.vertex2i(left, top);
                 gGL.vertex2i(left, bottom);
                 gGL.vertex2i(right, bottom);
@@ -782,14 +782,14 @@ void gl_arc_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled, F
 
                 if (filled)
                 {
-                        gGL.begin(LLVertexBuffer::TRIANGLE_FAN);
+                        gGL.begin(LLRender::TRIANGLE_FAN);
                         gGL.vertex2f(0.f, 0.f);
                         // make sure circle is complete
                         steps += 1;
                 }
                 else
                 {
-                        gGL.begin(LLVertexBuffer::LINE_STRIP);
+                        gGL.begin(LLRender::LINE_STRIP);
                 }
 
                 while( steps-- )
@@ -809,7 +809,7 @@ void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled
 {
         gGL.pushMatrix();
         {
-                LLGLSNoTexture gls_no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
                 gGL.translatef(center_x, center_y, 0.f);
 
                 // Inexact, but reasonably fast.
@@ -821,14 +821,14 @@ void gl_circle_2d(F32 center_x, F32 center_y, F32 radius, S32 steps, BOOL filled
 
                 if (filled)
                 {
-                        gGL.begin(LLVertexBuffer::TRIANGLE_FAN);
+                        gGL.begin(LLRender::TRIANGLE_FAN);
                         gGL.vertex2f(0.f, 0.f);
                         // make sure circle is complete
                         steps += 1;
                 }
                 else
                 {
-                        gGL.begin(LLVertexBuffer::LINE_LOOP);
+                        gGL.begin(LLRender::LINE_LOOP);
                 }
 
                 while( steps-- )
@@ -850,7 +850,7 @@ void gl_deep_circle( F32 radius, F32 depth, S32 steps )
         F32 x = radius;
         F32 y = 0.f;
         F32 angle_delta = F_TWO_PI / (F32)steps;
-        gGL.begin( LLVertexBuffer::TRIANGLE_STRIP  );
+        gGL.begin( LLRender::TRIANGLE_STRIP  );
         {
                 S32 step = steps + 1; // An extra step to close the circle.
                 while( step-- )
@@ -905,7 +905,7 @@ void gl_rect_2d_checkerboard(const LLRect& rect)
                 first = FALSE;
         }
         
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         // ...white squares
         gGL.color3f( 1.f, 1.f, 1.f );
@@ -935,9 +935,9 @@ void gl_washer_2d(F32 outer_radius, F32 inner_radius, S32 steps, const LLColor4&
         F32 x2 = inner_radius;
         F32 y2 = 0.f;
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-        gGL.begin( LLVertexBuffer::TRIANGLE_STRIP  );
+        gGL.begin( LLRender::TRIANGLE_STRIP  );
         {
                 steps += 1; // An extra step to close the circle.
                 while( steps-- )
@@ -972,8 +972,8 @@ void gl_washer_segment_2d(F32 outer_radius, F32 inner_radius, F32 start_radians,
         F32 x2 = inner_radius * cos( start_radians );
         F32 y2 = inner_radius * sin( start_radians );
 
-        LLGLSNoTexture gls_no_texture;
-        gGL.begin( LLVertexBuffer::TRIANGLE_STRIP  );
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
+        gGL.begin( LLRender::TRIANGLE_STRIP  );
         {
                 steps += 1; // An extra step to close the circle.
                 while( steps-- )
@@ -1008,9 +1008,9 @@ void gl_washer_spokes_2d(F32 outer_radius, F32 inner_radius, S32 count, const LL
         F32 x2 = inner_radius * cos( HALF_DELTA );
         F32 y2 = inner_radius * sin( HALF_DELTA );
 
-        LLGLSNoTexture gls_no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
-        gGL.begin( LLVertexBuffer::LINES  );
+        gGL.begin( LLRender::LINES  );
         {
                 while( count-- )
                 {
@@ -1033,7 +1033,7 @@ void gl_washer_spokes_2d(F32 outer_radius, F32 inner_radius, S32 count, const LL
 
 void gl_rect_2d_simple_tex( S32 width, S32 height )
 {
-        gGL.begin( LLVertexBuffer::QUADS );
+        gGL.begin( LLRender::QUADS );
 
                 gGL.texCoord2f(1.f, 1.f);
                 gGL.vertex2i(width, height);
@@ -1052,7 +1052,7 @@ void gl_rect_2d_simple_tex( S32 width, S32 height )
 
 void gl_rect_2d_simple( S32 width, S32 height )
 {
-        gGL.begin( LLVertexBuffer::QUADS );
+        gGL.begin( LLRender::QUADS );
                 gGL.vertex2i(width, height);
                 gGL.vertex2i(0, height);
                 gGL.vertex2i(0, 0);
@@ -1094,7 +1094,7 @@ void gl_segmented_rect_2d_tex(const S32 left,
         LLVector2 width_vec((F32)width, 0.f);
         LLVector2 height_vec(0.f, (F32)height);
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 // draw bottom left
                 gGL.texCoord2f(0.f, 0.f);
@@ -1262,7 +1262,7 @@ void gl_segmented_rect_2d_fragment_tex(const S32 left,
         LLVector2 x_min;
         LLVector2 x_max;
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 if (start_fragment < middle_start)
                 {
@@ -1419,7 +1419,7 @@ void gl_segmented_rect_3d_tex(const LLVector2& border_scale, const LLVector3& bo
         LLVector3 bottom_border_height = ((edges & (~(U32)ROUNDED_RECT_TOP)) != 0) ? border_height : LLVector3::zero;
 
 
-        gGL.begin(LLVertexBuffer::QUADS);
+        gGL.begin(LLRender::QUADS);
         {
                 // draw bottom left
                 gGL.texCoord2f(0.f, 0.f);
@@ -1575,7 +1575,7 @@ void LLUI::initClass(LLControlGroup* config,
 void LLUI::cleanupClass()
 {
         sImageProvider->cleanUp();
-        LLLineEditor::cleanupClass();
+        LLLineEditor::cleanupLineEditor();
 }
 
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 034c49b..bc6fe7e 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -1281,7 +1281,7 @@ void LLView::drawDebugRect()
         LLUI::pushMatrix();
         {
                 // drawing solids requires texturing be disabled
-                LLGLSNoTexture no_texture;
+                gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
                 if (mUseBoundingRect)
                 {
@@ -1303,7 +1303,7 @@ void LLView::drawDebugRect()
 
                 gGL.color4fv( border_color.mV );
 
-                gGL.begin(LLVertexBuffer::LINES);
+                gGL.begin(LLRender::LINES);
                         gGL.vertex2i(0, debug_rect.getHeight() - 1);
                         gGL.vertex2i(0, 0);
 
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index 8a5beea..a1c26d6 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -111,7 +111,7 @@ void LLViewBorder::draw()
 
 void LLViewBorder::drawOnePixelLines()
 {
-        LLGLSNoTexture uiNoTexture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
         LLColor4 top_color = mHighlightLight;
         LLColor4 bottom_color = mHighlightLight;
@@ -158,7 +158,7 @@ void LLViewBorder::drawOnePixelLines()
 
 void LLViewBorder::drawTwoPixelLines()
 {
-        LLGLSNoTexture no_texture;
+        gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
         
         LLColor4 focus_color = gFocusMgr.getFocusColor();
 
@@ -230,7 +230,7 @@ void LLViewBorder::drawTextures()
 
         //gGL.color4fv(UI_VERTEX_COLOR.mV);
 
-        //mTexture->bind();
+        //gGL.getTexUnit(0)->bind(mTexture);
         //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
         //glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
 
@@ -248,7 +248,7 @@ void LLViewBorder::drawTextureTrapezoid( F32 degrees, S32 width, S32 length, F32
                 gGL.translatef(start_x, start_y, 0.f);
                 glRotatef( degrees, 0, 0, 1 );
 
-                gGL.begin(LLVertexBuffer::QUADS);
+                gGL.begin(LLRender::QUADS);
                 {
                         //      width, width   /---------\ length-width, width          //
                         //                                    /           \                                                     //