Second Life viewer sources 1.20.7

22 files changed, 161 insertions, 105 deletions

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 3ada389..3eead67 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -48,7 +48,7 @@
 #include "llglheaders.h"
 #include "llfocusmgr.h"
 #include "llwindow.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 
 static LLRegisterWidget<LLButton> r("button");
 
@@ -574,9 +574,9 @@ void LLButton::draw()
                         mImagep->draw(getLocalRect(), getEnabled() ? mImageColor : mDisabledImageColor  );
                         if (mCurGlowStrength > 0.01f)
                         {
-                                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                                gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
                                 mImagep->drawSolid(0, 0, getRect().getWidth(), getRect().getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
-                                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                                gGL.setSceneBlendType(LLRender::BT_ALPHA);
                         }
                 }
                 else
@@ -584,9 +584,9 @@ void LLButton::draw()
                         mImagep->draw(0, 0, getEnabled() ? mImageColor : mDisabledImageColor );
                         if (mCurGlowStrength > 0.01f)
                         {
-                                glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                                gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
                                 mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
-                                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                                gGL.setSceneBlendType(LLRender::BT_ALPHA);
                         }
                 }
         }
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 0523a11..d5edba7 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -565,6 +565,8 @@ void LLComboBox::showList()
 
         S32 min_width = getRect().getWidth();
         S32 max_width = llmax(min_width, MAX_COMBO_WIDTH);
+        // make sure we have up to date content width metrics
+        mList->calcColumnWidths();
         S32 list_width = llclamp(mList->getMaxContentWidth(), min_width, max_width);
 
         if (mListPosition == BELOW)
@@ -781,8 +783,18 @@ BOOL LLComboBox::handleKeyHere(KEY key, MASK mask)
                         mList->highlightNthItem(mList->getItemIndex(last_selected_item));
                 }
                 result = mList->handleKeyHere(key, mask);
+
+                // will only see return key if it is originating from line editor
+                // since the dropdown button eats the key
+                if (key == KEY_RETURN)
+                {
+                        // don't show list and don't eat key input when committing
+                        // free-form text entry with RETURN since user already knows
+            // what they are trying to select
+                        return FALSE;
+                }
                 // if selection has changed, pop open list
-                if (mList->getLastSelectedItem() != last_selected_item)
+                else if (mList->getLastSelectedItem() != last_selected_item)
                 {
                         showList();
                 }
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index bf50830..759fae0 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -832,8 +832,14 @@ void LLFloater::setMinimized(BOOL minimize)
 
                 for (S32 i = 0; i < 4; i++)
                 {
-                        if (mResizeBar[i]) mResizeBar[i]->setEnabled(FALSE);
-                        if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(FALSE);
+                        if (mResizeBar[i] != NULL)
+                        {
+                                mResizeBar[i]->setEnabled(FALSE);
+                        }
+                        if (mResizeHandle[i] != NULL)
+                        {
+                                mResizeHandle[i]->setEnabled(FALSE);
+                        }
                 }
 
                 mMinimized = TRUE;
@@ -875,8 +881,14 @@ void LLFloater::setMinimized(BOOL minimize)
 
                 for (S32 i = 0; i < 4; i++)
                 {
-                        if (mResizeBar[i]) mResizeBar[i]->setEnabled(isResizable());
-                        if (mResizeHandle[i]) mResizeHandle[i]->setEnabled(isResizable());
+                        if (mResizeBar[i] != NULL)
+                        {
+                                mResizeBar[i]->setEnabled(isResizable());
+                        }
+                        if (mResizeHandle[i] != NULL)
+                        {
+                                mResizeHandle[i]->setEnabled(isResizable());
+                        }
                 }
 
                 mMinimized = FALSE;
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index aeb906c..a12c9d8 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -132,7 +132,8 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
                 mSelectAllonFocusReceived( FALSE ),
                 mPassDelete(FALSE),
                 mReadOnly(FALSE),
-                mImage( sImage )
+                mImage( sImage ),
+                mReplaceNewlinesWithSpaces( TRUE )
 {
         llassert( max_length_bytes > 0 );
 
@@ -961,7 +962,7 @@ void LLLineEditor::paste()
                         LLWString clean_string(paste);
                         LLWString::replaceTabsWithSpaces(clean_string, 1);
                         //clean_string = wstring_detabify(paste, 1);
-                        LLWString::replaceChar(clean_string, '\n', ' ');
+                        LLWString::replaceChar(clean_string, '\n', mReplaceNewlinesWithSpaces ? ' ' : 182); // 182 == paragraph character
 
                         // Insert the string
 
@@ -2547,6 +2548,10 @@ S32 LLLineEditor::getPreeditFontSize() const
         return llround(mGLFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]);
 }
 
+void LLLineEditor::setReplaceNewlinesWithSpaces(BOOL replace)
+{
+        mReplaceNewlinesWithSpaces = replace;
+}
 
 static LLRegisterWidget<LLSearchEditor> r2("search_editor");
 
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index bf0dcb5..c96e34d 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -211,6 +211,8 @@ public:
         void                    setEnableLineHistory( BOOL enabled ) { mHaveHistory = enabled; } // switches line history on or off 
         void                    updateHistory(); // stores current line in history
 
+        void                    setReplaceNewlinesWithSpaces(BOOL replace);
+        
 private:
         // private helper methods
         void                    removeChar();
@@ -311,6 +313,8 @@ private:
         // Instances that by default point to the statics but can be overidden in XML.
         LLPointer<LLUIImage> mImage;
 
+        BOOL        mReplaceNewlinesWithSpaces; // if false, will replace pasted newlines with paragraph symbol.
+
         // private helper class
         class LLLineEditorRollback
         {
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index f2486f1..5e46ab7 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -47,7 +47,7 @@
 
 #include "llmath.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llfocusmgr.h"
 #include "llfont.h"
 #include "llcoord.h"
diff --git a/linden/indra/llui/llresizebar.cpp b/linden/indra/llui/llresizebar.cpp
index e89bfee..fd571a1 100644
--- a/linden/indra/llui/llresizebar.cpp
+++ b/linden/indra/llui/llresizebar.cpp
@@ -50,6 +50,7 @@ LLResizeBar::LLResizeBar( const LLString& name, LLView* resizing_view, const LLR
         mMaxSize( max_size ),
         mSide( side ),
         mSnappingEnabled(TRUE),
+        mAllowDoubleClickSnapping(TRUE),
         mResizingView(resizing_view)
 {
         // set up some generically good follow code.
@@ -260,27 +261,31 @@ BOOL LLResizeBar::handleDoubleClick(S32 x, S32 y, MASK mask)
         LLRect orig_rect = mResizingView->getRect();
         LLRect scaled_rect = orig_rect;
 
-        if (mSnappingEnabled)
+        if (mSnappingEnabled && mAllowDoubleClickSnapping)
         {
                 switch( mSide )
                 {
                 case LEFT:
                         mResizingView->findSnapEdge(scaled_rect.mLeft, LLCoordGL(0, 0), SNAP_LEFT, SNAP_PARENT_AND_SIBLINGS, S32_MAX);
+                        scaled_rect.mLeft = scaled_rect.mRight - llclamp(scaled_rect.getWidth(), mMinSize, mMaxSize);
                         break;
                 case TOP:
                         mResizingView->findSnapEdge(scaled_rect.mTop, LLCoordGL(0, 0), SNAP_TOP, SNAP_PARENT_AND_SIBLINGS, S32_MAX);
+                        scaled_rect.mTop = scaled_rect.mBottom + llclamp(scaled_rect.getHeight(), mMinSize, mMaxSize);
                         break;
                 case RIGHT:
                         mResizingView->findSnapEdge(scaled_rect.mRight, LLCoordGL(0, 0), SNAP_RIGHT, SNAP_PARENT_AND_SIBLINGS, S32_MAX);
+                        scaled_rect.mRight = scaled_rect.mLeft + llclamp(scaled_rect.getWidth(), mMinSize, mMaxSize);
                         break;
                 case BOTTOM:
                         mResizingView->findSnapEdge(scaled_rect.mBottom, LLCoordGL(0, 0), SNAP_BOTTOM, SNAP_PARENT_AND_SIBLINGS, S32_MAX);
+                        scaled_rect.mBottom = scaled_rect.mTop - llclamp(scaled_rect.getHeight(), mMinSize, mMaxSize);
                         break;
                 }
+
+                mResizingView->userSetShape(scaled_rect);
         }
 
-        mResizingView->reshape(scaled_rect.getWidth(), scaled_rect.getHeight());
-        mResizingView->setOrigin(scaled_rect.mLeft, scaled_rect.mBottom);
         return TRUE;
 }
 
diff --git a/linden/indra/llui/llresizebar.h b/linden/indra/llui/llresizebar.h
index d03dafa..f8a7514 100644
--- a/linden/indra/llui/llresizebar.h
+++ b/linden/indra/llui/llresizebar.h
@@ -50,6 +50,7 @@ public:
 
         void                    setResizeLimits( S32 min_size, S32 max_size ) { mMinSize = min_size; mMaxSize = max_size; }
         void                    setEnableSnapping(BOOL enable) { mSnappingEnabled = enable; }
+        void                    setAllowDoubleClickSnapping(BOOL allow) { mAllowDoubleClickSnapping = allow; }
 
 private:
         S32                             mDragLastScreenX;
@@ -61,6 +62,7 @@ private:
         S32                             mMaxSize;
         const Side              mSide;
         BOOL                    mSnappingEnabled;
+        BOOL                    mAllowDoubleClickSnapping;
         LLView*                 mResizingView;
 };
 
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 8940b80..3d412c1 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -46,7 +46,7 @@
 #include "llwindow.h"
 #include "llglheaders.h"
 #include "llcontrol.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 
 LLScrollbar::LLScrollbar(
                 const LLString& name, LLRect rect,
@@ -520,9 +520,9 @@ void LLScrollbar::draw()
                 rounded_rect_imagep->draw(mThumbRect, mThumbColor);
                 if (mCurGlowStrength > 0.01f)
                 {
-                        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+                        gGL.setSceneBlendType(LLRender::BT_ADD_WITH_ALPHA);
                         rounded_rect_imagep->drawSolid(mThumbRect, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
-                        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+                        gGL.setSceneBlendType(LLRender::BT_ALPHA);
                 }
 
         }
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index f0b0b81..1217a58 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -33,7 +33,7 @@
 #include "linden_common.h"
 
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 
 #include "llscrollcontainer.h"
 #include "llscrollbar.h"
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 32c4e82..9693df4 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -43,7 +43,7 @@
 #include "llclipboard.h"
 #include "llfocusmgr.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llglheaders.h"
 #include "llresmgr.h"
 #include "llscrollbar.h"
@@ -1117,9 +1117,7 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
                         if( itemp->getEnabled() )
                         {
                                 selectItem(itemp, FALSE);
-                                success = TRUE;
-                                if (!success)
-                                        mOriginalSelection = first_index;
+                                success = TRUE;                         
                         }
                 }
                 else
@@ -1198,7 +1196,7 @@ void LLScrollListCtrl::deleteItems(const LLSD& sd)
                                 mLastSelected = NULL;
                         }
                         delete itemp;
-                        mItemList.erase(iter++);
+                        iter = mItemList.erase(iter);
                 }
                 else
                 {
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 9e85b20..f196975 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -249,6 +249,18 @@ void LLSpinCtrl::setValue(const LLSD& value )
         }
 }
 
+//no matter if Editor has the focus, update the value
+void LLSpinCtrl::forceSetValue(const LLSD& value )
+{
+        F32 v = (F32)value.asReal();
+        if (mValue != v || !mbHasBeenSet)
+        {
+                mbHasBeenSet = TRUE;
+                mValue = v;
+                
+                updateEditor();
+        }
+}
 
 void LLSpinCtrl::clear()
 {
diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h
index 790e216..5d040fd 100644
--- a/linden/indra/llui/llspinctrl.h
+++ b/linden/indra/llui/llspinctrl.h
@@ -66,6 +66,7 @@ public:
         virtual LLXMLNodePtr getXML(bool save_children = true) const;
         static LLView* fromXML(LLXMLNodePtr node, LLView *parent, class LLUICtrlFactory *factory);
 
+        virtual void    forceSetValue(const LLSD& value ) ;
         virtual void    setValue(const LLSD& value );
         virtual LLSD    getValue() const { return mValue; }
                         F32             get() const { return (F32)getValue().asReal(); }
@@ -87,6 +88,7 @@ public:
         virtual void    setIncrement(F32 inc)                   { mIncrement = inc; }
         virtual F32             getMinValue()                   { return mMinValue ; }
         virtual F32     getMaxValue()                   { return mMaxValue ; }
+        virtual F32     getIncrement()          { return mIncrement ; }
 
         void                    setLabel(const LLStringExplicit& label);
         void                    setLabelColor(const LLColor4& c)                        { mTextEnabledColor = c; }
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h
index 6f0099c..56f1398 100644
--- a/linden/indra/llui/llstyle.h
+++ b/linden/indra/llui/llstyle.h
@@ -37,7 +37,7 @@
 #include "llfont.h"
 #include "llui.h"
 
-class LLStyle
+class LLStyle : public LLRefCount
 {
 public:
         LLStyle();
@@ -46,8 +46,6 @@ public:
 
         LLStyle &operator=(const LLStyle &rhs);
 
-        virtual ~LLStyle() { }
-
         virtual void init (BOOL is_visible, const LLColor4 &color, const LLString& font_name);
 
         virtual const LLColor4& getColor() const { return mColor; }
@@ -101,6 +99,9 @@ public:
         S32         mImageWidth;
         S32         mImageHeight;
 
+protected:
+        virtual ~LLStyle() { }
+
 private:
         BOOL            mVisible;
         LLColor4        mColor;
@@ -111,4 +112,6 @@ private:
         BOOL            mIsEmbeddedItem;
 };
 
+typedef LLPointer<LLStyle> LLStyleSP;
+
 #endif  // LL_LLSTYLE_H
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 44f1f20..827d4fb 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -40,7 +40,7 @@
 #include "llcriticaldamp.h"
 #include "lluictrlfactory.h"
 #include "lltabcontainervertical.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 
 
 const F32 SCROLL_STEP_TIME = 0.4f;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index 4ed936f..71522e5 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -37,7 +37,7 @@
 
 #include "llfontgl.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llui.h"
 #include "lluictrlfactory.h"
 #include "llrect.h"
@@ -1244,14 +1244,14 @@ BOOL LLTextEditor::handleHover(S32 x, S32 y, MASK mask)
                         const LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
                         if( cur_segment )
                         {
-                                if(cur_segment->getStyle().isLink())
+                                if(cur_segment->getStyle()->isLink())
                                 {
                                         lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over link, inactive)" << llendl;          
                                         getWindow()->setCursor(UI_CURSOR_HAND);
                                         handled = TRUE;
                                 }
                                 else
-                                if(cur_segment->getStyle().getIsEmbeddedItem())
+                                if(cur_segment->getStyle()->getIsEmbeddedItem())
                                 {
                                         lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << " (over embedded item, inactive)" << llendl;         
                                         getWindow()->setCursor(UI_CURSOR_HAND);
@@ -2928,23 +2928,26 @@ void LLTextEditor::drawText()
                         S32 clipped_len =       clipped_end - seg_start;
                         if( clipped_len > 0 )
                         {
-                                LLStyle style = cur_segment->getStyle();
-                                if ( style.isImage() && (cur_segment->getStart() >= seg_start) && (cur_segment->getStart() <= clipped_end))
+                                LLStyleSP style = cur_segment->getStyle();
+                                if ( style->isImage() && (cur_segment->getStart() >= seg_start) && (cur_segment->getStart() <= clipped_end))
                                 {
-                                        LLUIImagePtr image = style.getImage();
-                                        image->draw(llround(text_x), llround(text_y)+line_height-style.mImageHeight, style.mImageWidth, style.mImageHeight);
+                                        S32 style_image_height = style->mImageHeight;
+                                        S32 style_image_width = style->mImageWidth;
+                                        LLUIImagePtr image = style->getImage();
+                                        image->draw(llround(text_x), llround(text_y)+line_height-style_image_height, 
+                                                style_image_width, style_image_height);
                                 }
 
-                                if (cur_segment == mHoverSegment && style.getIsEmbeddedItem())
+                                if (cur_segment == mHoverSegment && style->getIsEmbeddedItem())
                                 {
-                                        style.mUnderline = TRUE;
+                                        style->mUnderline = TRUE;
                                 }
 
                                 S32 left_pos = llmin( mSelectionStart, mSelectionEnd );
                                 
                                 if ( (mParseHTML) && (left_pos > seg_start) && (left_pos < clipped_end) &&  mIsSelecting && (mSelectionStart == mSelectionEnd) )
                                 {
-                                        mHTML = style.getLinkHREF();
+                                        mHTML = style->getLinkHREF();
                                 }
 
                                 drawClippedSegment( text, seg_start, clipped_end, text_x, text_y, selection_left, selection_right, style, &text_x );
@@ -2963,38 +2966,38 @@ void LLTextEditor::drawText()
 }
 
 // Draws a single text segment, reversing the color for selection if needed.
-void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyle& style, F32* right_x )
+void LLTextEditor::drawClippedSegment(const LLWString &text, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyleSP& style, F32* right_x )
 {
-        if (!style.isVisible())
+        if (!style->isVisible())
         {
                 return;
         }
 
         const LLFontGL* font = mGLFont;
 
-        LLColor4 color = style.getColor();
+        LLColor4 color = style->getColor();
 
-        if ( style.getFontString()[0] )
+        if ( style->getFontString()[0] )
         {
-                font = LLResMgr::getInstance()->getRes(style.getFontID());
+                font = LLResMgr::getInstance()->getRes(style->getFontID());
         }
 
         U8 font_flags = LLFontGL::NORMAL;
         
-        if (style.mBold)
+        if (style->mBold)
         {
                 font_flags |= LLFontGL::BOLD;
         }
-        if (style.mItalic)
+        if (style->mItalic)
         {
                 font_flags |= LLFontGL::ITALIC;
         }
-        if (style.mUnderline)
+        if (style->mUnderline)
         {
                 font_flags |= LLFontGL::UNDERLINE;
         }
 
-        if (style.getIsEmbeddedItem())
+        if (style->getIsEmbeddedItem())
         {
                 if (mReadOnly)
                 {
@@ -3434,17 +3437,17 @@ void LLTextEditor::appendColoredText(const LLString &new_text,
                                                                          const LLColor4 &color,
                                                                          const LLString& font_name)
 {
-        LLStyle style;
-        style.setVisible(true);
-        style.setColor(color);
-        style.setFontName(font_name);
+        LLStyleSP style(new LLStyle);
+        style->setVisible(true);
+        style->setColor(color);
+        style->setFontName(font_name);
         appendStyledText(new_text, allow_undo, prepend_newline, &style);
 }
 
 void LLTextEditor::appendStyledText(const LLString &new_text, 
                                                                          bool allow_undo, 
                                                                          bool prepend_newline,
-                                                                         const LLStyle* style)
+                                                                         const LLStyleSP *stylep)
 {
         if(mParseHTML)
         {
@@ -3453,17 +3456,17 @@ void LLTextEditor::appendStyledText(const LLString &new_text,
                 LLString text = new_text;
                 while ( findHTML(text, &start, &end) )
                 {
-                        LLStyle html;
-                        html.setVisible(true);
-                        html.setColor(mLinkColor);
-                        if (style)
+                        LLStyleSP html(new LLStyle);
+                        html->setVisible(true);
+                        html->setColor(mLinkColor);
+                        if (stylep)
                         {
-                                html.setFontName(style->getFontString());
+                                html->setFontName((*stylep)->getFontString());
                         }
-                        html.mUnderline = TRUE;
+                        html->mUnderline = TRUE;
 
-                        if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, style);
-                        html.setLinkHREF(text.substr(start,end-start));
+                        if (start > 0) appendText(text.substr(0,start),allow_undo, prepend_newline, stylep);
+                        html->setLinkHREF(text.substr(start,end-start));
                         appendText(text.substr(start, end-start),allow_undo, prepend_newline, &html);
                         if (end < (S32)text.length()) 
                         {
@@ -3475,17 +3478,17 @@ void LLTextEditor::appendStyledText(const LLString &new_text,
                                 break;
                         }
                 }
-                if (end < (S32)text.length()) appendText(text,allow_undo, prepend_newline, style);      
+                if (end < (S32)text.length()) appendText(text,allow_undo, prepend_newline, stylep);
         }
         else
         {
-                appendText(new_text, allow_undo, prepend_newline, style);
+                appendText(new_text, allow_undo, prepend_newline, stylep);
         }
 }
 
 // Appends new text to end of document
 void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool prepend_newline,
-                                                          const LLStyle* segment_style)
+                                                          const LLStyleSP *stylep)
 {
         // Save old state
         BOOL was_scrolled_to_bottom = (mScrollbar->getDocPos() == mScrollbar->getDocPosMax());
@@ -3513,11 +3516,11 @@ void LLTextEditor::appendText(const LLString &new_text, bool allow_undo, bool pr
                 append(utf8str_to_wstring(new_text), TRUE );
         }
 
-        if (segment_style)
+        if (stylep)
         {
                 S32 segment_start = old_length;
                 S32 segment_end = getLength();
-                LLTextSegment* segment = new LLTextSegment(*segment_style, segment_start, segment_end );
+                LLTextSegment* segment = new LLTextSegment(*stylep, segment_start, segment_end );
                 mSegments.push_back(segment);
         }
         
@@ -3803,8 +3806,8 @@ void LLTextEditor::findEmbeddedItemSegments()
                 in_text = TRUE;
         }
 
-        LLStyle embedded_style;
-        embedded_style.setIsEmbeddedItem( TRUE );
+        LLStyleSP embedded_style(new LLStyle);
+        embedded_style->setIsEmbeddedItem( TRUE );
 
         // Start with i just after the first embedded item
         while ( text[idx] )
@@ -4003,7 +4006,7 @@ BOOL LLTextEditor::exportBuffer(LLString &buffer )
 LLTextSegment::LLTextSegment(S32 start) : mStart(start)
 {
 } 
-LLTextSegment::LLTextSegment( const LLStyle& style, S32 start, S32 end ) :
+LLTextSegment::LLTextSegment( const LLStyleSP& style, S32 start, S32 end ) :
         mStyle( style ),
         mStart( start),
         mEnd( end ),
@@ -4011,9 +4014,8 @@ LLTextSegment::LLTextSegment( const LLStyle& style, S32 start, S32 end ) :
         mIsDefault(FALSE)
 {
 }
-LLTextSegment::LLTextSegment(
-        const LLColor4& color, S32 start, S32 end, BOOL is_visible) :
-        mStyle( is_visible, color,"" ),
+LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end, BOOL is_visible) :
+        mStyle(new LLStyle(is_visible,color,"")),
         mStart( start),
         mEnd( end ),
         mToken(NULL),
@@ -4021,7 +4023,7 @@ LLTextSegment::LLTextSegment(
 {
 }
 LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end ) :
-        mStyle( TRUE, color,"" ),
+        mStyle(new LLStyle(TRUE, color,"" )),
         mStart( start),
         mEnd( end ),
         mToken(NULL),
@@ -4029,7 +4031,7 @@ LLTextSegment::LLTextSegment( const LLColor4& color, S32 start, S32 end ) :
 {
 }
 LLTextSegment::LLTextSegment( const LLColor3& color, S32 start, S32 end ) :
-        mStyle( TRUE, color,"" ),
+        mStyle(new LLStyle(TRUE, color,"" )),
         mStart( start),
         mEnd( end ),
         mToken(NULL),
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 54a34cc..d5a68ca 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -139,7 +139,7 @@ public:
         void                    insertText(const LLString &text);
         // appends text at end
         void                    appendText(const LLString &wtext, bool allow_undo, bool prepend_newline,
-                                                           const LLStyle* segment_style = NULL);
+                                                           const LLStyleSP *stylep = NULL);
 
         void                    appendColoredText(const LLString &wtext, bool allow_undo, 
                                                                           bool prepend_newline,
@@ -148,7 +148,7 @@ public:
         // if styled text starts a line, you need to prepend a newline.
         void                    appendStyledText(const LLString &new_text, bool allow_undo, 
                                                                          bool prepend_newline,
-                                                                         const LLStyle* style);
+                                                                         const LLStyleSP *stylep = NULL);
 
         // Removes text from the end of document
         // Does not change highlight or cursor position.
@@ -429,7 +429,7 @@ private:
         void                    drawSelectionBackground();
         void                    drawCursor();
         void                    drawText();
-        void                    drawClippedSegment(const LLWString &wtext, S32 seg_start, S32 seg_end, F32 x, F32 y, S32 selection_left, S32 selection_right, const LLStyle& color, F32* right_x);
+        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);
 
         //
         // Data
@@ -528,7 +528,7 @@ class LLTextSegment
 public:
         // for creating a compare value
         LLTextSegment(S32 start);
-        LLTextSegment( const LLStyle& style, S32 start, S32 end );
+        LLTextSegment( const LLStyleSP& style, S32 start, S32 end );
         LLTextSegment( const LLColor4& color, S32 start, S32 end, BOOL is_visible);
         LLTextSegment( const LLColor4& color, S32 start, S32 end );
         LLTextSegment( const LLColor3& color, S32 start, S32 end );
@@ -536,10 +536,10 @@ public:
         S32                                     getStart() const                                        { return mStart; }
         S32                                     getEnd() const                                          { return mEnd; }
         void                            setEnd( S32 end )                                       { mEnd = end; }
-        const LLColor4&         getColor() const                                        { return mStyle.getColor(); }
-        void                            setColor(const LLColor4 &color)         { mStyle.setColor(color); }
-        const LLStyle&          getStyle() const                                        { return mStyle; }
-        void                            setStyle(const LLStyle &style)          { mStyle = style; }
+        const LLColor4&         getColor() const                                        { return mStyle->getColor(); }
+        void                            setColor(const LLColor4 &color)         { mStyle->setColor(color); }
+        const LLStyleSP&        getStyle() const                                        { return mStyle; }
+        void                            setStyle(const LLStyleSP &style)        { mStyle = style; }
         void                            setIsDefault(BOOL b)                            { mIsDefault = b; }
         BOOL                            getIsDefault() const                            { return mIsDefault; }
         void                            setToken( LLKeywordToken* token )       { mToken = token; }
@@ -557,7 +557,7 @@ public:
         };
         
 private:
-        LLStyle     mStyle;
+        LLStyleSP       mStyle;
         S32                     mStart;
         S32                     mEnd;
         LLKeywordToken* mToken;
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 45b1175..d2084e3 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -42,7 +42,7 @@
 #include "v2math.h"
 #include "v4color.h"
 #include "llgl.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llrect.h"
 #include "llimagegl.h"
 //#include "llviewerimage.h"
@@ -493,18 +493,8 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLIma
         
         if (solid_color)
         {
-                glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE,          GL_COMBINE_ARB);
-                glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB_ARB,           GL_REPLACE);
-                glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_ALPHA_ARB,         GL_MODULATE);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_RGB_ARB,           GL_PREVIOUS);
-                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_RGB_ARB,          GL_SRC_COLOR);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE0_ALPHA_ARB,         GL_TEXTURE);
-                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND0_ALPHA_ARB,        GL_SRC_ALPHA);
-
-                glTexEnvi(GL_TEXTURE_ENV, GL_SOURCE1_ALPHA_ARB,         GL_PRIMARY_COLOR_ARB);
-                glTexEnvi(GL_TEXTURE_ENV, GL_OPERAND1_ALPHA_ARB,        GL_SRC_ALPHA);
+                gGL.getTexUnit(0)->setTextureColorBlend(LLTexUnit::TBO_REPLACE, LLTexUnit::TBS_PREV_COLOR);
+                gGL.getTexUnit(0)->setTextureAlphaBlend(LLTexUnit::TBO_MULT, LLTexUnit::TBS_TEX_ALPHA, LLTexUnit::TBS_VERT_ALPHA);
         }
 
         gGL.pushMatrix();
@@ -640,7 +630,7 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLIma
 
         if (solid_color)
         {
-                glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+                gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT);
         }
 }
 
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index cc8135c..7df6ebe 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -104,10 +104,17 @@ static LLRegisterWidget<LLUICtrlLocate> r2("pad");
 // LLUICtrlFactory()
 //-----------------------------------------------------------------------------
 LLUICtrlFactory::LLUICtrlFactory()
+        : mDummyPanel(NULL)
 {
         setupPaths();
 }
 
+LLUICtrlFactory::~LLUICtrlFactory()
+{
+        delete mDummyPanel;
+        mDummyPanel = NULL;
+}
+
 void LLUICtrlFactory::setupPaths()
 {
         LLString filename = gDirUtilp->getExpandedFilename(LL_PATH_SKINS, "paths.xml");
@@ -428,10 +435,6 @@ void LLUICtrlFactory::rebuild()
 
 LLView *LLUICtrlFactory::createCtrlWidget(LLPanel *parent, LLXMLNodePtr node)
 {
-        // panel for holding dummy widgets, so they have a parent for layout purposes, etc.
-        // does not manage lifetime of child widgets
-        static LLPanel dummy_panel;
-
         LLString ctrl_type = node->getName()->mString;
         LLString::toLower(ctrl_type);
         
@@ -445,7 +448,11 @@ LLView *LLUICtrlFactory::createCtrlWidget(LLPanel *parent, LLXMLNodePtr node)
 
         if (parent == NULL)
         {
-                parent = &dummy_panel;
+                if (mDummyPanel == NULL)
+                {
+                        mDummyPanel = new LLPanel;
+                }
+                parent = mDummyPanel;
         }
         LLView *ctrl = func(node, parent, this);
 
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index b9325a0..0c1d9dd 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -46,7 +46,7 @@ class LLUICtrlFactory : public LLSingleton<LLUICtrlFactory>
 public:
         LLUICtrlFactory();
         // do not call!  needs to be public so run-time can clean up the singleton
-        virtual ~LLUICtrlFactory() {}
+        virtual ~LLUICtrlFactory();
 
         void setupPaths();
 
@@ -88,6 +88,8 @@ private:
         std::deque<const LLCallbackMap::map_t*> mFactoryStack;
 
         static std::vector<LLString> mXUIPaths;
+
+        LLPanel* mDummyPanel;
 };
 
 
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index 750821c..91c9564 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -37,7 +37,7 @@
 #include <cassert>
 #include <boost/tokenizer.hpp>
 
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llevent.h"
 #include "llfontgl.h"
 #include "llfocusmgr.h"
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index e9b7ca5..c354ac5 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -30,7 +30,7 @@
 
 #include "linden_common.h"
 #include "llviewborder.h"
-#include "llglimmediate.h"
+#include "llrender.h"
 #include "llfocusmgr.h"
 
 static LLRegisterWidget<LLViewBorder> r("view_border");