Second Life viewer sources 1.19.0.0

88 files changed, 4267 insertions, 1963 deletions

diff --git a/linden/indra/llui/llalertdialog.cpp b/linden/indra/llui/llalertdialog.cpp
index fd0262d..204fb10 100644
--- a/linden/indra/llui/llalertdialog.cpp
+++ b/linden/indra/llui/llalertdialog.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -41,6 +41,7 @@
 #include "llcheckboxctrl.h"
 #include "llkeyboard.h"
 #include "llfocusmgr.h"
+#include "lliconctrl.h"
 #include "llui.h"
 #include "llxmlnode.h"
 #include "lllineeditor.h"
@@ -143,6 +144,7 @@ LLAlertDialog::LLAlertDialog( const LLAlertDialogTemplate* xml_template,
                 mDefaultOption( 0 ),
                 mOptionChosen( -1 ),
                 mCheck(NULL),
+                mCaution(xml_template->mCaution),
                 mUnique(xml_template->mUnique),
                 mIgnorable(xml_template->mIgnorable),
                 mLabel(xml_template->mLabel),
@@ -211,6 +213,16 @@ bool LLAlertDialog::show()
                 }
         }
 
+        // If this is a caution message, change the color and add an icon.
+        if (mCaution)
+        {
+                setBackgroundColor( LLUI::sColorsGroup->getColor( "AlertCautionBoxColor" ) );
+        }
+        else
+        {
+                setBackgroundColor( LLUI::sColorsGroup->getColor( "AlertBoxColor" ) );
+        }
+
         // Check to see if we are already displaying the alert
         if (mUnique)
         {
@@ -311,19 +323,35 @@ void LLAlertDialog::createDialog(const std::vector<LLString>* optionsp, S32 defa
                 dialog_width = llmax(dialog_width, S32(font->getWidth( edit_text ) + 0.99f));
                 dialog_height += EDITOR_HEIGHT;
         }
-
+        if (mCaution)
+        {
+                // Make room for the caution icon.
+                dialog_width += 32 + HPAD;
+        }
         reshape( dialog_width, dialog_height, FALSE );
 
         S32 msg_y = mRect.getHeight() - VPAD;
+        S32 msg_x = HPAD;
         if (hasTitleBar())
         {
                 msg_y -= LINE_HEIGHT; // room for title
         }
 
+        if (mCaution)
+        {
+                LLIconCtrl* icon = new LLIconCtrl("icon", LLRect(msg_x, msg_y, msg_x+32, msg_y-32), "notify_caution_icon.tga");
+                icon->setMouseOpaque(FALSE);
+                addChild(icon);
+                msg_x += 32 + HPAD;
+                msg_box->setColor( LLUI::sColorsGroup->getColor( "AlertCautionTextColor" ) );
+        }
+        else
+        {
+                msg_box->setColor( LLUI::sColorsGroup->getColor( "AlertTextColor" ) );
+        }
         LLRect rect;
-        rect.setLeftTopAndSize( HPAD, msg_y, text_rect.getWidth(), text_rect.getHeight() );
+        rect.setLeftTopAndSize( msg_x, msg_y, text_rect.getWidth(), text_rect.getHeight() );
         msg_box->setRect( rect );
-        msg_box->setColor( LLUI::sColorsGroup->getColor( "LabelTextColor" ) );
         addChild(msg_box);
 
         // Buttons      
@@ -688,6 +716,15 @@ bool LLAlertDialog::parseAlerts(const LLString& xml_filename, LLControlGroup* se
                                 xml_template->mModal = modal;
                         }
                 }
+                // caution=
+                BOOL caution;
+                if (alert->getAttributeBOOL("caution", caution))
+                {
+                        if (xml_template)
+                        {
+                                xml_template->mCaution = caution;
+                        }
+                }
                 // unique=
                 BOOL unique;
                 if (alert->getAttributeBOOL("unique", unique))
diff --git a/linden/indra/llui/llalertdialog.h b/linden/indra/llui/llalertdialog.h
index 016a4b4..31f4769 100644
--- a/linden/indra/llui/llalertdialog.h
+++ b/linden/indra/llui/llalertdialog.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -78,6 +78,7 @@ public:
 
         bool                    setCheckBox( const LLString&, const LLString& );        
         void                    setOptionEnabled( S32 option, BOOL enable );
+        void                    setCaution(BOOL val = TRUE) { mCaution = val; }
         // If mUnique==TRUE only one copy of this message should exist
         void                    setUnique(BOOL val = TRUE) { mUnique = val; }
         void                    setEditTextCallback(alert_text_callback_t callback, void *user_data);
@@ -129,6 +130,7 @@ protected:
         S32             mDefaultOption;
         BOOL    mOptionChosen;
         LLCheckBoxCtrl* mCheck;
+        BOOL    mCaution;
         BOOL    mUnique;
         S32             mIgnorable;
         LLString mLabel;
@@ -163,7 +165,7 @@ private:
 class LLAlertDialogTemplate : public LLRefCount
 {
 public:
-        LLAlertDialogTemplate() : mTitle(), mURLOption(0), mModal(FALSE), mUnique(FALSE), mIgnorable(0), mDefaultOption(0) {}
+        LLAlertDialogTemplate() : mTitle(), mURLOption(0), mModal(FALSE), mCaution(FALSE), mUnique(FALSE), mIgnorable(0), mDefaultOption(0) {}
         
         void addOption(const LLString& label, const LLString& ignore_text, BOOL is_default = FALSE)
         {
@@ -205,6 +207,7 @@ public:
         LLString mURL;                          // Some alerts will direct the resident to a URL
         S32 mURLOption;
         BOOL mModal;
+        BOOL mCaution;
         BOOL mUnique;
         S32 mIgnorable; // 0 = Never Ignore, 1 = Do default option, 2 = Do saved option
         std::vector<LLString> mOptions;
diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 71260b2..9fa1c8e 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -59,9 +59,6 @@ S32 BTN_HEIGHT		= 0;
 S32 BTN_GRID            = 12;
 S32 BORDER_SIZE = 1;
 
-// static
-LLFrameTimer    LLButton::sFlashingTimer;
-
 LLButton::LLButton(     const LLString& name, const LLRect& rect, const LLString& control_name, void (*click_callback)(void*), void *callback_data)
 :       LLUICtrl(name, rect, TRUE, NULL, NULL),
         mClickedCallback( click_callback ),
@@ -79,6 +76,7 @@ LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& co
         mImageDisabled( NULL ),
         mImageDisabledSelected( NULL ),
         mToggleState( FALSE ),
+        mIsToggle( FALSE ),
         mScaleImage( TRUE ),
         mDropShadowedText( TRUE ),
         mBorderEnabled( FALSE ),
@@ -86,8 +84,6 @@ LLButton::LLButton(	const LLString& name, const LLRect& rect, const LLString& co
         mHAlign( LLFontGL::HCENTER ),
         mLeftHPad( LLBUTTON_H_PAD ),
         mRightHPad( LLBUTTON_H_PAD ),
-        mFixedWidth( 16 ),
-        mFixedHeight( 16 ),
         mHoverGlowStrength(0.15f),
         mCurGlowStrength(0.f),
         mNeedsHighlight(FALSE),
@@ -134,6 +130,7 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
         mImageDisabled( NULL ),
         mImageDisabledSelected( NULL ),
         mToggleState( FALSE ),
+        mIsToggle( FALSE ),
         mScaleImage( TRUE ),
         mDropShadowedText( TRUE ),
         mBorderEnabled( FALSE ),
@@ -141,8 +138,6 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
         mHAlign( LLFontGL::HCENTER ),
         mLeftHPad( LLBUTTON_H_PAD ), 
         mRightHPad( LLBUTTON_H_PAD ),
-        mFixedWidth( 16 ),
-        mFixedHeight( 16 ),
         mHoverGlowStrength(0.25f),
         mCurGlowStrength(0.f),
         mNeedsHighlight(FALSE),
@@ -158,15 +153,11 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
 
         if( unselected_image_name != "" )
         {
+                // user-specified image - don't use fixed borders unless requested
                 setImageUnselected(unselected_image_name);
                 setImageDisabled(unselected_image_name);
                 
                 mDisabledImageColor.mV[VALPHA] = 0.5f;
-                mImageDisabled = mImageUnselected;
-                mDisabledImageColor.mV[VALPHA] = 0.5f;
-                // user-specified image - don't use fixed borders unless requested
-                mFixedWidth = 0;
-                mFixedHeight = 0;
                 mScaleImage = FALSE;
         }
         else
@@ -177,13 +168,11 @@ LLButton::LLButton(const LLString& name, const LLRect& rect,
 
         if( selected_image_name != "" )
         {
+                // user-specified image - don't use fixed borders unless requested
                 setImageSelected(selected_image_name);
                 setImageDisabledSelected(selected_image_name);
 
                 mDisabledImageColor.mV[VALPHA] = 0.5f;
-                // user-specified image - don't use fixed borders unless requested
-                mFixedWidth = 0;
-                mFixedHeight = 0;
                 mScaleImage = FALSE;
         }
         else
@@ -273,6 +262,12 @@ void LLButton::onCommit()
                 make_ui_sound("UISndClickRelease");
         }
 
+        if (mIsToggle)
+        {
+                toggleState();
+        }
+
+        // do this last, as it can result in destroying this button
         if (mClickedCallback)
         {
                 (*mClickedCallback)( mCallbackUserData );
@@ -286,6 +281,11 @@ BOOL LLButton::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent)
         BOOL handled = FALSE;
         if( getVisible() && mEnabled && !called_from_parent && ' ' == uni_char && !gKeyboard->getKeyRepeated(' '))
         {
+                if (mIsToggle)
+                {
+                        toggleState();
+                }
+
                 if (mClickedCallback)
                 {
                         (*mClickedCallback)( mCallbackUserData );
@@ -302,11 +302,17 @@ BOOL LLButton::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent )
         {
                 if( mCommitOnReturn && KEY_RETURN == key && mask == MASK_NONE && !gKeyboard->getKeyRepeated(key))
                 {
+                        if (mIsToggle)
+                        {
+                                toggleState();
+                        }
+
+                        handled = TRUE;
+
                         if (mClickedCallback)
                         {
                                 (*mClickedCallback)( mCallbackUserData );
                         }
-                        handled = TRUE;
                 }
         }
         return handled;
@@ -354,6 +360,9 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
                         (*mMouseUpCallback)(mCallbackUserData);
                 }
 
+                mMouseDownTimer.stop();
+                mMouseDownTimer.reset();
+
                 // DO THIS AT THE VERY END to allow the button to be destroyed as a result of being clicked.
                 // If mouseup in the widget, it's been clicked
                 if (pointInView(x, y))
@@ -363,6 +372,11 @@ BOOL LLButton::handleMouseUp(S32 x, S32 y, MASK mask)
                                 make_ui_sound("UISndClickRelease");
                         }
 
+                        if (mIsToggle)
+                        {
+                                toggleState();
+                        }
+
                         if (mClickedCallback)
                         {
                                 (*mClickedCallback)( mCallbackUserData );
@@ -422,8 +436,10 @@ void LLButton::draw()
                 BOOL flash = FALSE;
                 if( mFlashing )
                 {
-                        F32 elapsed = LLButton::sFlashingTimer.getElapsedTimeF32();
-                        flash = S32(elapsed * 2) & 1;
+                        F32 elapsed = mFlashingTimer.getElapsedTimeF32();
+                        S32 flash_count = S32(elapsed * LLUI::sConfigGroup->getF32("ButtonFlashRate") * 2.f);
+                        // flash on or off?
+                        flash = (flash_count % 2 == 0) || flash_count > (F32)LLUI::sConfigGroup->getS32("ButtonFlashCount");
                 }
 
                 BOOL pressed_by_keyboard = FALSE;
@@ -443,24 +459,14 @@ void LLButton::draw()
                 cursor_pos_gl.mY = llround((F32)cursor_pos_gl.mY / LLUI::sGLScaleFactor.mV[VY]);
                 screenPointToLocal(cursor_pos_gl.mX, cursor_pos_gl.mY, &local_mouse_x, &local_mouse_y);
 
-                BOOL pressed = pressed_by_keyboard || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y));
-
-                BOOL display_state = FALSE;
-                if( pressed )
-                {
-                        mImagep = mImageSelected;
-                        // show the resulting state after releasing the mouse button while it is down
-                        display_state = mToggleState ? FALSE : TRUE;
-                }
-                else
-                {
-                        display_state = mToggleState || flash;
-                }
+                BOOL pressed = pressed_by_keyboard 
+                                                || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)) 
+                                                || mToggleState;
                 
                 BOOL use_glow_effect = FALSE;
-                if ( mNeedsHighlight )
+                if ( mNeedsHighlight || flash )
                 {
-                        if (display_state)
+                        if (pressed)
                         {
                                 if (mImageHoverSelected)
                                 {
@@ -485,7 +491,7 @@ void LLButton::draw()
                                 }
                         }
                 }
-                else if ( display_state )
+                else if ( pressed )
                 {
                         mImagep = mImageSelected;
                 }
@@ -499,11 +505,11 @@ void LLButton::draw()
                 //   enabled and tentative
                 // or
                 //   disabled but checked
-                if (!mImageDisabledSelected.isNull() && ( (mEnabled && mTentative) || (!mEnabled && display_state ) ) )
+                if (!mImageDisabledSelected.isNull() && ( (mEnabled && mTentative) || (!mEnabled && pressed ) ) )
                 {
                         mImagep = mImageDisabledSelected;
                 }
-                else if (!mImageDisabled.isNull() && !mEnabled && !display_state)
+                else if (!mImageDisabled.isNull() && !mEnabled && !pressed)
                 {
                         mImagep = mImageDisabled;
                 }
@@ -516,33 +522,34 @@ void LLButton::draw()
                 // Figure out appropriate color for the text
                 LLColor4 label_color;
 
+                // label changes when button state changes, not when pressed
                 if ( mEnabled )
                 {
-                        if ( !display_state )
+                        if ( mToggleState )
                         {
-                                label_color = mUnselectedLabelColor;
+                                label_color = mSelectedLabelColor;
                         }
                         else
                         {
-                                label_color = mSelectedLabelColor;
+                                label_color = mUnselectedLabelColor;
                         }
                 }
                 else
                 {
-                        if ( !display_state )
+                        if ( mToggleState )
                         {
-                                label_color = mDisabledLabelColor;
+                                label_color = mDisabledSelectedLabelColor;
                         }
                         else
                         {
-                                label_color = mDisabledSelectedLabelColor;
+                                label_color = mDisabledLabelColor;
                         }
                 }
 
                 // Unselected label assignments
                 LLWString label;
 
-                if( display_state )
+                if( mToggleState )
                 {
                         if( mEnabled || mDisabledSelectedLabel.empty() )
                         {
@@ -591,24 +598,22 @@ void LLButton::draw()
                 // Otherwise draw basic rectangular button.
                 if( mImagep.notNull() && !mScaleImage)
                 {
-                        gl_draw_image( 0, 0, mImagep, mEnabled ? mImageColor : mDisabledImageColor );
+                        mImagep->draw(0, 0, mEnabled ? mImageColor : mDisabledImageColor );
                         if (mCurGlowStrength > 0.01f)
                         {
                                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                                gl_draw_scaled_image_with_border(0, 0, 0, 0, mImagep->getWidth(), mImagep->getHeight(), mImagep, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength), TRUE);
+                                mImagep->drawSolid(0, 0, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
                                 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                         }
                 }
                 else
                 if ( mImagep.notNull() && mScaleImage)
                 {
-                        gl_draw_scaled_image_with_border(0, 0, mFixedWidth, mFixedHeight, mRect.getWidth(), mRect.getHeight(), 
-                                                                                        mImagep, mEnabled ? mImageColor : mDisabledImageColor  );
+                        mImagep->draw(0, 0, mRect.getWidth(), mRect.getHeight(), mEnabled ? mImageColor : mDisabledImageColor  );
                         if (mCurGlowStrength > 0.01f)
                         {
                                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-                                gl_draw_scaled_image_with_border(0, 0, mFixedWidth, mFixedHeight, mRect.getWidth(), mRect.getHeight(), 
-                                                                                        mImagep, LLColor4(1.f, 1.f, 1.f, mCurGlowStrength), TRUE);
+                                mImagep->drawSolid(0, 0, mRect.getWidth(), mRect.getHeight(), LLColor4(1.f, 1.f, 1.f, mCurGlowStrength));
                                 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                         }
                 }
@@ -620,13 +625,17 @@ void LLButton::draw()
                         gl_rect_2d(0, mRect.getHeight(), mRect.getWidth(), 0, LLColor4::pink1, FALSE);
                 }
 
+                // let overlay image and text play well together
+                S32 text_left = mLeftHPad;
+                S32 text_right = mRect.getWidth() - mRightHPad;
+                S32 text_width = mRect.getWidth() - mLeftHPad - mRightHPad;
+
                 // draw overlay image
                 if (mImageOverlay.notNull())
                 {
-                        const S32 IMG_PAD = 5;
                         // get max width and height (discard level 0)
-                        S32 overlay_width = mImageOverlay->getWidth(0);
-                        S32 overlay_height = mImageOverlay->getHeight(0);
+                        S32 overlay_width = mImageOverlay->getWidth();
+                        S32 overlay_height = mImageOverlay->getHeight();
 
                         F32 scale_factor = llmin((F32)mRect.getWidth() / (F32)overlay_width, (F32)mRect.getHeight() / (F32)overlay_height, 1.f);
                         overlay_width = llround((F32)overlay_width * scale_factor);
@@ -635,34 +644,49 @@ void LLButton::draw()
                         S32 center_x = getLocalRect().getCenterX();
                         S32 center_y = getLocalRect().getCenterY();
 
+                        //FUGLY HACK FOR "DEPRESSED" BUTTONS
+                        if (pressed)
+                        {
+                                center_y--;
+                                center_x++;
+                        }
+
+                        // fade out overlay images on disabled buttons
+                        LLColor4 overlay_color = mImageOverlayColor;
+                        if (!getEnabled())
+                        {
+                                overlay_color.mV[VALPHA] = 0.5f;
+                        }
+
                         switch(mImageOverlayAlignment)
                         {
                         case LLFontGL::LEFT:
-                                gl_draw_scaled_image(
-                                        IMG_PAD, 
+                                text_left += overlay_width + 1;
+                                text_width -= overlay_width + 1;
+                                mImageOverlay->draw(
+                                        mLeftHPad, 
                                         center_y - (overlay_height / 2), 
                                         overlay_width, 
                                         overlay_height, 
-                                        mImageOverlay,
-                                        mImageOverlayColor);
+                                        overlay_color);
                                 break;
                         case LLFontGL::HCENTER:
-                                gl_draw_scaled_image(
+                                mImageOverlay->draw(
                                         center_x - (overlay_width / 2), 
                                         center_y - (overlay_height / 2), 
                                         overlay_width, 
                                         overlay_height, 
-                                        mImageOverlay,
-                                        mImageOverlayColor);
+                                        overlay_color);
                                 break;
                         case LLFontGL::RIGHT:
-                                gl_draw_scaled_image(
-                                        mRect.getWidth() - IMG_PAD - overlay_width, 
+                                text_right -= overlay_width + 1;                                
+                                text_width -= overlay_width + 1;
+                                mImageOverlay->draw(
+                                        mRect.getWidth() - mRightHPad - overlay_width, 
                                         center_y - (overlay_height / 2), 
                                         overlay_width, 
                                         overlay_height, 
-                                        mImageOverlay,
-                                        mImageOverlayColor);
+                                        overlay_color);
                                 break;
                         default:
                                 // draw nothing
@@ -673,28 +697,26 @@ void LLButton::draw()
                 // Draw label
                 if( !label.empty() )
                 {
-                        S32 drawable_width = mRect.getWidth() - mLeftHPad - mRightHPad;
-
                         LLWString::trim(label);
 
                         S32 x;
                         switch( mHAlign )
                         {
                         case LLFontGL::RIGHT:
-                                x = mRect.getWidth() - mRightHPad;
+                                x = text_right;
                                 break;
                         case LLFontGL::HCENTER:
                                 x = mRect.getWidth() / 2;
                                 break;
                         case LLFontGL::LEFT:
                         default:
-                                x = mLeftHPad;
+                                x = text_left;
                                 break;
                         }
 
                         S32 y_offset = 2 + (mRect.getHeight() - 20)/2;
                 
-                        if (pressed || display_state)
+                        if (pressed)
                         {
                                 y_offset--;
                                 x++;
@@ -704,7 +726,7 @@ void LLButton::draw()
                                 label_color,
                                 mHAlign, LLFontGL::BOTTOM,
                                 mDropShadowedText ? LLFontGL::DROP_SHADOW_SOFT : LLFontGL::NORMAL,
-                                U32_MAX, drawable_width,
+                                U32_MAX, text_width,
                                 NULL, FALSE, FALSE);
                 }
 
@@ -733,13 +755,11 @@ void LLButton::drawBorder(const LLColor4& color, S32 size)
 
         if (mScaleImage)
         {
-                gl_draw_scaled_image_with_border(left, bottom, mFixedWidth, mFixedHeight, right-left, top-bottom, 
-                                                                mImagep, color, TRUE );
+                mImagep->drawSolid(left, bottom, right-left, top-bottom, color);
         }
         else
         {
-                gl_draw_scaled_image_with_border(left, bottom, 0, 0, mImagep->getWidth() + size * 2, 
-                                                                mImagep->getHeight() + size * 2, mImagep, color, TRUE );
+                mImagep->drawSolid(left, bottom, mImagep->getWidth() + size * 2, mImagep->getHeight() + size * 2, color);
         }
 }
 
@@ -763,6 +783,22 @@ void LLButton::setToggleState(BOOL b)
         }
 }
 
+void LLButton::setFlashing( BOOL b )    
+{ 
+        if (b != mFlashing)
+        {
+                mFlashing = b; 
+                mFlashingTimer.reset();
+        }
+}
+
+
+BOOL LLButton::toggleState()                    
+{ 
+        setToggleState( !mToggleState ); 
+        return mToggleState; 
+}
+
 void LLButton::setValue(const LLSD& value )
 {
         mToggleState = value.asBoolean();
@@ -770,7 +806,7 @@ void LLButton::setValue(const LLSD& value )
 
 LLSD LLButton::getValue() const
 {
-        return mToggleState;
+        return mToggleState == TRUE;
 }
 
 void LLButton::setLabel( const LLStringExplicit& label )
@@ -807,10 +843,9 @@ void LLButton::setDisabledSelectedLabel( const LLStringExplicit& label )
         mDisabledSelectedLabel = label;
 }
 
-void LLButton::setImageUnselectedID( const LLUUID &image_id )
-{       
-        mImageUnselectedName = "";
-        mImageUnselected = LLUI::sImageProvider->getUIImageByID(image_id);
+void LLButton::setImageUnselected(LLPointer<LLUIImage> image)
+{
+        mImageUnselected = image;
 }
 
 void LLButton::setImages( const LLString &image_name, const LLString &selected_name )
@@ -820,10 +855,9 @@ void LLButton::setImages( const LLString &image_name, const LLString &selected_n
 
 }
 
-void LLButton::setImageSelectedID( const LLUUID &image_id )
+void LLButton::setImageSelected(LLPointer<LLUIImage> image)
 {
-        mImageSelectedName = "";
-        mImageSelected = LLUI::sImageProvider->getUIImageByID(image_id);
+        mImageSelected = image;
 }
 
 void LLButton::setImageColor(const LLColor4& c)         
@@ -831,19 +865,22 @@ void LLButton::setImageColor(const LLColor4& c)
         mImageColor = c; 
 }
 
+void LLButton::setColor(const LLColor4& color)
+{
+        setImageColor(color);
+}
+
 
-void LLButton::setImageDisabledID( const LLUUID &image_id )
+void LLButton::setImageDisabled(LLPointer<LLUIImage> image)
 {
-        mImageDisabledName = "";
-        mImageDisabled = LLUI::sImageProvider->getUIImageByID(image_id);
+        mImageDisabled = image;
         mDisabledImageColor = mImageColor;
         mDisabledImageColor.mV[VALPHA] *= 0.5f;
 }
 
-void LLButton::setImageDisabledSelectedID( const LLUUID &image_id )
-{       
-        mImageDisabledSelectedName = "";
-        mImageDisabledSelected = LLUI::sImageProvider->getUIImageByID(image_id);
+void LLButton::setImageDisabledSelected(LLPointer<LLUIImage> image)
+{
+        mImageDisabledSelected = image;
         mDisabledImageColor = mImageColor;
         mDisabledImageColor.mV[VALPHA] *= 0.5f;
 }
@@ -855,11 +892,9 @@ void LLButton::setDisabledImages( const LLString &image_name, const LLString &se
         mDisabledImageColor = c;
 }
 
-
-void LLButton::setImageHoverSelectedID( const LLUUID& image_id )
+void LLButton::setImageHoverSelected(LLPointer<LLUIImage> image)
 {
-        mImageHoverSelectedName = "";
-        mImageHoverSelected = LLUI::sImageProvider->getUIImageByID(image_id);
+        mImageHoverSelected = image;
 }
 
 void LLButton::setDisabledImages( const LLString &image_name, const LLString &selected_name)
@@ -869,10 +904,9 @@ void LLButton::setDisabledImages( const LLString &image_name, const LLString &se
         setDisabledImages( image_name, selected_name, clr );
 }
 
-void LLButton::setImageHoverUnselectedID( const LLUUID& image_id )
+void LLButton::setImageHoverUnselected(LLPointer<LLUIImage> image)
 {
-        mImageHoverUnselectedName = "";
-        mImageHoverUnselected = LLUI::sImageProvider->getUIImageByID(image_id);
+        mImageHoverUnselected = image;
 }
 
 void LLButton::setHoverImages( const LLString& image_name, const LLString& selected_name )
@@ -889,8 +923,7 @@ void LLButton::setImageOverlay(const LLString &image_name, LLFontGL::HAlign alig
         }
         else
         {
-                LLUUID overlay_image_id = LLUI::findAssetUUIDByName(image_name);
-                mImageOverlay = LLUI::sImageProvider->getUIImageByID(overlay_image_id);
+                mImageOverlay = LLUI::getUIImageByName(image_name);
                 mImageOverlayAlignment = alignment;
                 mImageOverlayColor = color;
         }
@@ -904,34 +937,6 @@ void LLButton::onMouseCaptureLost()
 }
 
 //-------------------------------------------------------------------------
-// LLSquareButton
-//-------------------------------------------------------------------------
-LLSquareButton::LLSquareButton(const LLString& name, const LLRect& rect, 
-                const LLString& label,
-                const LLFontGL *font,
-                const LLString& control_name,   
-                void (*click_callback)(void*),
-                void *callback_data,
-                const LLString& selected_label )
-:       LLButton(name, rect, "","", 
-                        control_name, 
-                        click_callback, callback_data,
-                        font,
-                        label, 
-                        (selected_label.empty() ? label : selected_label) )
-{ 
-        setImageUnselected("square_btn_32x128.tga");
-        //      mImageUnselected = LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("square_btn_32x128.tga")));
-        setImageSelected("square_btn_selected_32x128.tga");
-        //      mImageSelectedImage = LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("square_btn_selected_32x128.tga")));
-        setImageDisabled("square_btn_32x128.tga");
-        //mDisabledImage = LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("square_btn_32x128.tga")));
-        setImageDisabledSelected("square_btn_selected_32x128.tga");
-        //mDisabledSelectedImage = LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("square_btn_selected_32x128.tga")));
-        mImageColor = LLUI::sColorsGroup->getColor("ButtonColor");
-}
-
-//-------------------------------------------------------------------------
 // Utilities
 //-------------------------------------------------------------------------
 S32 round_up(S32 grid, S32 value)
@@ -951,37 +956,37 @@ S32 round_up(S32 grid, S32 value)
 
 void                    LLButton::setImageUnselected(const LLString &image_name)
 {       
-        setImageUnselectedID(LLUI::findAssetUUIDByName(image_name));
+        setImageUnselected(LLUI::getUIImageByName(image_name));
         mImageUnselectedName = image_name;
 }
 
 void                    LLButton::setImageSelected(const LLString &image_name)
 {       
-        setImageSelectedID(LLUI::findAssetUUIDByName(image_name));
+        setImageSelected(LLUI::getUIImageByName(image_name));
         mImageSelectedName = image_name;
 }
 
 void                    LLButton::setImageHoverSelected(const LLString &image_name)
 {
-        setImageHoverSelectedID(LLUI::findAssetUUIDByName(image_name));
+        setImageHoverSelected(LLUI::getUIImageByName(image_name));
         mImageHoverSelectedName = image_name;
 }
 
 void                    LLButton::setImageHoverUnselected(const LLString &image_name)
 {
-        setImageHoverUnselectedID(LLUI::findAssetUUIDByName(image_name));
+        setImageHoverUnselected(LLUI::getUIImageByName(image_name));
         mImageHoverUnselectedName = image_name;
 }
 
 void                    LLButton::setImageDisabled(const LLString &image_name)
 {
-        setImageDisabledID(LLUI::findAssetUUIDByName(image_name));
+        setImageDisabled(LLUI::getUIImageByName(image_name));
         mImageDisabledName = image_name;
 }
 
 void                    LLButton::setImageDisabledSelected(const LLString &image_name)
 {
-        setImageDisabledSelectedID(LLUI::findAssetUUIDByName(image_name));
+        setImageDisabledSelected(LLUI::getUIImageByName(image_name));
         mImageDisabledSelectedName = image_name;
 }
 
@@ -1009,8 +1014,6 @@ LLXMLNodePtr LLButton::getXML(bool save_children) const
         node->createChild("label_selected", TRUE)->setStringValue(getLabelSelected());
         node->createChild("font", TRUE)->setStringValue(LLFontGL::nameFromFont(mGLFont));
         node->createChild("halign", TRUE)->setStringValue(LLFontGL::nameFromHAlign(mHAlign));
-        node->createChild("border_width", TRUE)->setIntValue(mFixedWidth);
-        node->createChild("border_height", TRUE)->setIntValue(mFixedHeight);
 
         addImageAttributeToXML(node,mImageUnselectedName,mImageUnselectedID,"image_unselected");
         addImageAttributeToXML(node,mImageSelectedName,mImageSelectedID,"image_selected");
@@ -1092,8 +1095,12 @@ LLView* LLButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *fa
                         label,
                         label_selected);
 
-        node->getAttributeS32("border_width", button->mFixedWidth);
-        node->getAttributeS32("border_height", button->mFixedHeight);
+        node->getAttributeS32("pad_right", button->mRightHPad);
+        node->getAttributeS32("pad_left", button->mLeftHPad);
+
+        BOOL is_toggle = button->getIsToggle();
+        node->getAttributeBOOL("toggle", is_toggle);
+        button->setIsToggle(is_toggle);
 
         if(image_hover_selected != LLString::null) button->setImageHoverSelected(image_hover_selected);
         
diff --git a/linden/indra/llui/llbutton.h b/linden/indra/llui/llbutton.h
index 6a2b4a1..7d50f40 100644
--- a/linden/indra/llui/llbutton.h
+++ b/linden/indra/llui/llbutton.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -114,11 +114,13 @@ public:
 
         F32                             getHeldDownTime() const                                                         { return mMouseDownTimer.getElapsedTimeF32(); }
 
-        BOOL                    toggleState()                   { setToggleState( !mToggleState ); return mToggleState; }
+        BOOL                    getIsToggle() const { return mIsToggle; }
+        void                    setIsToggle(BOOL is_toggle) { mIsToggle = is_toggle; }
+        BOOL                    toggleState();
         BOOL                    getToggleState() const  { return mToggleState; }
         void                    setToggleState(BOOL b);
 
-        void                    setFlashing( BOOL b )   { mFlashing = b; }
+        void                    setFlashing( BOOL b );
         BOOL                    getFlashing() const             { return mFlashing; }
 
         void                    setHAlign( LLFontGL::HAlign align )             { mHAlign = align; }
@@ -128,14 +130,11 @@ public:
         const LLString  getLabelUnselected() const { return wstring_to_utf8str(mUnselectedLabel); }
         const LLString  getLabelSelected() const { return wstring_to_utf8str(mSelectedLabel); }
 
-
-        // HACK to allow images to be freed when the caller knows he's done with it.
-        LLImageGL*              getImageUnselected() const                                                      { return mImageUnselected; }
-
         void                    setImageColor(const LLString& color_control);
-        void                    setImages(const LLString &image_name, const LLString &selected_name);
         void                    setImageColor(const LLColor4& c);
-        
+        virtual void    setColor(const LLColor4& c);
+
+        void                    setImages(const LLString &image_name, const LLString &selected_name);
         void                    setDisabledImages(const LLString &image_name, const LLString &selected_name);
         void                    setDisabledImages(const LLString &image_name, const LLString &selected_name, const LLColor4& c);
         
@@ -146,7 +145,7 @@ public:
         void                    setDisabledSelectedLabelColor( const LLColor4& c )      { mDisabledSelectedLabelColor = c; }
 
         void                    setImageOverlay(const LLString &image_name, LLFontGL::HAlign alignment = LLFontGL::HCENTER, const LLColor4& color = LLColor4::white);
-        LLPointer<LLImageGL> getImageOverlay() { return mImageOverlay; }
+        LLPointer<LLUIImage> getImageOverlay() { return mImageOverlay; }
         
 
         virtual void    setValue(const LLSD& value );
@@ -170,16 +169,8 @@ public:
 
         static void             onHeldDown(void *userdata);  // to be called by gIdleCallbacks
 
-        void                    setFixedBorder(S32 width, S32 height) { mFixedWidth = width; mFixedHeight = height; }
         void                    setHoverGlowStrength(F32 strength) { mHoverGlowStrength = strength; }
 
-private:
-        void                    setImageUnselectedID(const LLUUID &image_id);
-        void                    setImageSelectedID(const LLUUID &image_id);
-        void                    setImageHoverSelectedID(const LLUUID &image_id);
-        void                    setImageHoverUnselectedID(const LLUUID &image_id);
-        void                    setImageDisabledID(const LLUUID &image_id);
-        void                    setImageDisabledSelectedID(const LLUUID &image_id);
 public:
         void                    setImageUnselected(const LLString &image_name);
         void                    setImageSelected(const LLString &image_name);
@@ -187,6 +178,14 @@ public:
         void                    setImageHoverUnselected(const LLString &image_name);
         void                    setImageDisabled(const LLString &image_name);
         void                    setImageDisabledSelected(const LLString &image_name);
+
+        void                    setImageUnselected(LLPointer<LLUIImage> image);
+        void                    setImageSelected(LLPointer<LLUIImage> image);
+        void                    setImageHoverSelected(LLPointer<LLUIImage> image);
+        void                    setImageHoverUnselected(LLPointer<LLUIImage> image);
+        void                    setImageDisabled(LLPointer<LLUIImage> image);
+        void                    setImageDisabledSelected(LLPointer<LLUIImage> image);
+
         void                    setCommitOnReturn(BOOL commit) { mCommitOnReturn = commit; }
         BOOL                    getCommitOnReturn() { return mCommitOnReturn; }
 
@@ -209,27 +208,27 @@ protected:
         F32                             mHeldDownDelay;         // seconds, after which held-down callbacks get called
         S32                             mHeldDownFrameDelay;    // frames, after which held-down callbacks get called
 
-        LLPointer<LLImageGL>    mImageOverlay;
+        LLPointer<LLUIImage>    mImageOverlay;
         LLFontGL::HAlign                mImageOverlayAlignment;
         LLColor4                                mImageOverlayColor;
 
-        LLPointer<LLImageGL>    mImageUnselected;
+        LLPointer<LLUIImage>    mImageUnselected;
         LLUIString                              mUnselectedLabel;
         LLColor4                                mUnselectedLabelColor;
 
-        LLPointer<LLImageGL>    mImageSelected;
+        LLPointer<LLUIImage>    mImageSelected;
         LLUIString                              mSelectedLabel;
         LLColor4                                mSelectedLabelColor;
 
-        LLPointer<LLImageGL>    mImageHoverSelected;
+        LLPointer<LLUIImage>    mImageHoverSelected;
 
-        LLPointer<LLImageGL>    mImageHoverUnselected;
+        LLPointer<LLUIImage>    mImageHoverUnselected;
 
-        LLPointer<LLImageGL>    mImageDisabled;
+        LLPointer<LLUIImage>    mImageDisabled;
         LLUIString                              mDisabledLabel;
         LLColor4                                mDisabledLabelColor;
 
-        LLPointer<LLImageGL>    mImageDisabledSelected;
+        LLPointer<LLUIImage>    mImageDisabledSelected;
         LLUIString                              mDisabledSelectedLabel;
         LLColor4                                mDisabledSelectedLabelColor;
 
@@ -254,6 +253,7 @@ protected:
         LLColor4                mImageColor;
         LLColor4                mDisabledImageColor;
 
+        BOOL                    mIsToggle;
         BOOL                    mToggleState;
         BOOL                    mScaleImage;
 
@@ -267,9 +267,6 @@ protected:
         S32                             mLeftHPad;
         S32                             mRightHPad;
 
-        S32                             mFixedWidth;
-        S32                             mFixedHeight;
-
         F32                             mHoverGlowStrength;
         F32                             mCurGlowStrength;
 
@@ -278,22 +275,9 @@ protected:
 
         LLString                mHelpURL;
 
-        LLPointer<LLImageGL> mImagep;
-
-        static LLFrameTimer     sFlashingTimer;
-};
+        LLPointer<LLUIImage> mImagep;
 
-class LLSquareButton
-:       public LLButton
-{
-public:
-        LLSquareButton(const LLString& name, const LLRect& rect, 
-                                   const LLString& label,
-                                   const LLFontGL *font = NULL,
-                                   const LLString& control_name = LLString(),   
-                                   void (*click_callback)(void*) = NULL,
-                                   void *callback_data = NULL,
-                                   const LLString& selected_label = LLString::null );
+        LLFrameTimer    mFlashingTimer;
 };
 
 // Helpful functions
diff --git a/linden/indra/llui/llcallbackmap.h b/linden/indra/llui/llcallbackmap.h
index 6b40f09..9241751 100644
--- a/linden/indra/llui/llcallbackmap.h
+++ b/linden/indra/llui/llcallbackmap.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llcheckboxctrl.cpp b/linden/indra/llui/llcheckboxctrl.cpp
index b184eda..ff46a80 100644
--- a/linden/indra/llui/llcheckboxctrl.cpp
+++ b/linden/indra/llui/llcheckboxctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -75,7 +75,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
         }
 
         // must be big enough to hold all children
-        setSpanChildren(TRUE);
+        setUseBoundingRect(TRUE);
 
         mKeyboardFocusOnClick = TRUE;
 
@@ -130,6 +130,7 @@ LLCheckBoxCtrl::LLCheckBoxCtrl(const LLString& name, const LLRect& rect,
                 mButton->setDisabledImages( inactive_false_id, inactive_true_id );
                 mButton->setHoverGlowStrength(0.35f);
         }
+        mButton->setIsToggle(TRUE);
         mButton->setToggleState( initial_value );
         mButton->setFollowsLeft();
         mButton->setFollowsBottom();
@@ -150,16 +151,11 @@ void LLCheckBoxCtrl::onButtonPress( void *userdata )
 
         if (self->mRadioStyle)
         {
-                if (!self->getValue())
-                {
-                        self->setValue(TRUE);
-                }
-        }
-        else
-        {
-                self->toggle();
+                self->setValue(TRUE);
         }
+
         self->setControlValue(self->getValue());
+        // HACK: because buttons don't normally commit
         self->onCommit();
 
         if (self->mKeyboardFocusOnClick)
@@ -232,14 +228,13 @@ void LLCheckBoxCtrl::draw()
 //virtual
 void LLCheckBoxCtrl::setValue(const LLSD& value )
 {
-        mSetValue = value.asBoolean();
-        mButton->setToggleState( mSetValue );
+        mButton->setValue( value );
 }
 
 //virtual
 LLSD LLCheckBoxCtrl::getValue() const
 {
-        return mButton->getToggleState();
+        return mButton->getValue();
 }
 
 void LLCheckBoxCtrl::setLabel( const LLStringExplicit& label )
diff --git a/linden/indra/llui/llcheckboxctrl.h b/linden/indra/llui/llcheckboxctrl.h
index 3fd0be7..1f92708 100644
--- a/linden/indra/llui/llcheckboxctrl.h
+++ b/linden/indra/llui/llcheckboxctrl.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llclipboard.cpp b/linden/indra/llui/llclipboard.cpp
index 774bad6..eaf7798 100644
--- a/linden/indra/llui/llclipboard.cpp
+++ b/linden/indra/llui/llclipboard.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llclipboard.h b/linden/indra/llui/llclipboard.h
index d4efc3a..82ea334 100644
--- a/linden/indra/llui/llclipboard.h
+++ b/linden/indra/llui/llclipboard.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index cfdcf58..22b5033 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -55,17 +55,16 @@
 // Globals
 S32 LLCOMBOBOX_HEIGHT = 0;
 S32 LLCOMBOBOX_WIDTH = 0;
- 
+S32 MAX_COMBO_WIDTH = 500;
+
 LLComboBox::LLComboBox( const LLString& name, const LLRect &rect, const LLString& label,
         void (*commit_callback)(LLUICtrl*,void*),
         void *callback_userdata
         )
 :       LLUICtrl(name, rect, TRUE, commit_callback, callback_userdata, 
                          FOLLOWS_LEFT | FOLLOWS_TOP),
-        mDrawArrow(TRUE),
         mTextEntry(NULL),
         mArrowImage(NULL),
-        mArrowImageWidth(8),
         mAllowTextEntry(FALSE),
         mMaxChars(20),
         mTextEntryTentative(TRUE),
@@ -73,55 +72,43 @@ LLComboBox::LLComboBox(	const LLString& name, const LLRect &rect, const LLString
         mPrearrangeCallback( NULL ),
         mTextEntryCallback( NULL )
 {
-        // For now, all comboboxes don't take keyboard focus when clicked.
-        // This might change if it is part of a modal dialog.
-        // mKeyboardFocusOnClick = FALSE;
-
-        // Revert to standard behavior.  When this control's parent is hidden, it needs to
-        // hide this ctrl--which won't just happen automatically since when LLComboBox is 
-        // showing its list, it's also set to TopCtrl.  When keyboard focus is cleared all
-        // controls (including this one) know that they are no longer editing.
-        mKeyboardFocusOnClick = TRUE;
-
-        LLRect r;
-        r.setOriginAndSize(0, 0, rect.getWidth(), rect.getHeight());
-
         // Always use text box 
         // Text label button
-        mButton = new LLSquareButton("comboxbox button",
-                                                                 r, label, NULL, LLString::null,
+        mButton = new LLButton("comboxbox button",
+                                                                 LLRect(), label, NULL, LLString::null,
                                                                  NULL, this);
+        mButton->setImageUnselected("square_btn_32x128.tga");
+        mButton->setImageSelected("square_btn_selected_32x128.tga");
+        mButton->setImageDisabled("square_btn_32x128.tga");
+        mButton->setImageDisabledSelected("square_btn_selected_32x128.tga");
+        mButton->setScaleImage(TRUE);
+
         mButton->setMouseDownCallback(onButtonDown);
         mButton->setFont(LLFontGL::sSansSerifSmall);
         mButton->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
         mButton->setHAlign( LLFontGL::LEFT );
-
-        const S32 ARROW_WIDTH = 16;
-        mButton->setRightHPad( ARROW_WIDTH );
+        mButton->setRightHPad(2);
         addChild(mButton);
 
-        // Default size, will be set by arrange() call in button callback. 
-        S32 list_width = mRect.getWidth() + SCROLLBAR_SIZE;
-        r.setOriginAndSize(0, 16, list_width, 220);
-
         // disallow multiple selection
         mList = new LLScrollListCtrl(
-                "ComboBox", r, 
+                "ComboBox", LLRect(), 
                 &LLComboBox::onItemSelected, this, FALSE);
         mList->setVisible(FALSE);
         mList->setBgWriteableColor( LLColor4(1,1,1,1) );
         mList->setCommitOnKeyboardMovement(FALSE);
-        mList->setFocusChangedCallback(onListFocusChanged);
         addChild(mList);
 
         LLRect border_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
         mBorder = new LLViewBorder( "combo border", border_rect );
         addChild( mBorder );
-        mBorder->setFollows(FOLLOWS_LEFT|FOLLOWS_RIGHT|FOLLOWS_TOP|FOLLOWS_BOTTOM);
+        mBorder->setFollowsAll();
 
         LLUUID arrow_image_id( LLUI::sAssetsGroup->getString("combobox_arrow.tga") );
-        mArrowImage = LLUI::sImageProvider->getUIImageByID(arrow_image_id);
-        mArrowImageWidth = llmax(8,mArrowImage->getWidth(0)); // In case image hasn't loaded yet
+        mArrowImage = LLUI::sImageProvider->getImageByID(arrow_image_id);
+        mButton->setImageOverlay("combobox_arrow.tga", LLFontGL::RIGHT);
+
+        updateLayout();
 }
 
 
@@ -155,7 +142,7 @@ LLXMLNodePtr LLComboBox::getXML(bool save_children) const
                         LLSD value = item->getValue();
                         item_node->createChild("value", TRUE)->setStringValue(value.asString());
                         item_node->createChild("enabled", TRUE)->setBoolValue(item->getEnabled());
-                        item_node->setStringValue(cell->getText());
+                        item_node->setStringValue(cell->getValue().asString());
                 }
         }
 
@@ -272,34 +259,46 @@ void	LLComboBox::resetDirty()
 
 
 // add item "name" to menu
-void LLComboBox::add(const LLString& name, EAddPosition pos, BOOL enabled)
+LLScrollListItem* LLComboBox::add(const LLString& name, EAddPosition pos, BOOL enabled)
 {
-        mList->addSimpleItem(name, pos, enabled);
+        LLScrollListItem* item = mList->addSimpleElement(name, pos);
+        item->setEnabled(enabled);
         mList->selectFirstItem();
+        return item;
 }
 
 // add item "name" with a unique id to menu
-void LLComboBox::add(const LLString& name, const LLUUID& id, EAddPosition pos, BOOL enabled )
+LLScrollListItem* LLComboBox::add(const LLString& name, const LLUUID& id, EAddPosition pos, BOOL enabled )
 {
-        mList->addSimpleItem(name, LLSD(id), pos, enabled);
+        LLScrollListItem* item = mList->addSimpleElement(name, pos, id);
+        item->setEnabled(enabled);
         mList->selectFirstItem();
+        return item;
 }
 
 // add item "name" with attached userdata
-void LLComboBox::add(const LLString& name, void* userdata, EAddPosition pos, BOOL enabled )
+LLScrollListItem* LLComboBox::add(const LLString& name, void* userdata, EAddPosition pos, BOOL enabled )
 {
-        LLScrollListItem* item = mList->addSimpleItem(name, pos, enabled);
+        LLScrollListItem* item = mList->addSimpleElement(name, pos);
+        item->setEnabled(enabled);
         item->setUserdata( userdata );
         mList->selectFirstItem();
+        return item;
 }
 
 // add item "name" with attached generic data
-void LLComboBox::add(const LLString& name, LLSD value, EAddPosition pos, BOOL enabled )
+LLScrollListItem* LLComboBox::add(const LLString& name, LLSD value, EAddPosition pos, BOOL enabled )
 {
-        mList->addSimpleItem(name, value, pos, enabled);
+        LLScrollListItem* item = mList->addSimpleElement(name, pos, value);
+        item->setEnabled(enabled);
         mList->selectFirstItem();
+        return item;
 }
 
+LLScrollListItem* LLComboBox::addSeparator(EAddPosition pos)
+{
+        return mList->addSeparator(pos);
+}
 
 void LLComboBox::sortByName()
 {
@@ -311,7 +310,7 @@ void LLComboBox::sortByName()
 // Returns TRUE if the item was found.
 BOOL LLComboBox::setSimple(const LLStringExplicit& name)
 {
-        BOOL found = mList->selectSimpleItem(name, FALSE);
+        BOOL found = mList->selectItemByLabel(name, FALSE);
 
         if (found)
         {
@@ -330,14 +329,14 @@ void LLComboBox::setValue(const LLSD& value)
                 LLScrollListItem* item = mList->getFirstSelected();
                 if (item)
                 {
-                        setLabel( mList->getSimpleSelectedItem() );
+                        setLabel( mList->getSelectedItemLabel() );
                 }
         }
 }
 
-const LLString& LLComboBox::getSimple() const
+const LLString LLComboBox::getSimple() const
 {
-        const LLString& res = mList->getSimpleSelectedItem();
+        const LLString res = mList->getSelectedItemLabel();
         if (res.empty() && mAllowTextEntry)
         {
                 return mTextEntry->getText();
@@ -348,9 +347,9 @@ const LLString& LLComboBox::getSimple() const
         }
 }
 
-const LLString& LLComboBox::getSimpleSelectedItem(S32 column) const
+const LLString LLComboBox::getSelectedItemLabel(S32 column) const
 {
-        return mList->getSimpleSelectedItem(column);
+        return mList->getSelectedItemLabel(column);
 }
 
 // virtual
@@ -373,10 +372,10 @@ LLSD LLComboBox::getValue() const
 
 void LLComboBox::setLabel(const LLStringExplicit& name)
 {
-        if ( mAllowTextEntry )
+        if ( mTextEntry )
         {
                 mTextEntry->setText(name);
-                if (mList->selectSimpleItem(name, FALSE))
+                if (mList->selectItemByLabel(name, FALSE))
                 {
                         mTextEntry->setTentative(FALSE);
                 }
@@ -385,7 +384,8 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
                         mTextEntry->setTentative(mTextEntryTentative);
                 }
         }
-        else
+        
+        if (!mAllowTextEntry)
         {
                 mButton->setLabelUnselected(name);
                 mButton->setLabelSelected(name);
@@ -397,7 +397,7 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
 
 BOOL LLComboBox::remove(const LLString& name)
 {
-        BOOL found = mList->selectSimpleItem(name);
+        BOOL found = mList->selectItemByLabel(name);
 
         if (found)
         {
@@ -433,16 +433,21 @@ void LLComboBox::onFocusLost()
         LLUICtrl::onFocusLost();
 }
 
+void LLComboBox::onLostTop()
+{
+        hideList();
+}
+
+
 void LLComboBox::setButtonVisible(BOOL visible)
 {
         mButton->setVisible(visible);
-        mDrawArrow = visible;
         if (mTextEntry)
         {
                 LLRect text_entry_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
                 if (visible)
                 {
-                        text_entry_rect.mRight -= mArrowImageWidth + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+                        text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth(0)) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
                 }
                 //mTextEntry->setRect(text_entry_rect);
                 mTextEntry->reshape(text_entry_rect.getWidth(), text_entry_rect.getHeight(), TRUE);
@@ -457,22 +462,8 @@ void LLComboBox::draw()
 
                 mButton->setEnabled(mEnabled /*&& !mList->isEmpty()*/);
 
-                // Draw children
+                // Draw children normally
                 LLUICtrl::draw();
-
-                if (mDrawArrow)
-                {
-                        // Paste the graphic on the right edge
-                        if (!mArrowImage.isNull())
-                        {
-                                S32 arrow_height = llmin(mRect.getHeight(), mArrowImage->getHeight());
-                                S32 arrow_width = llround((F32)mArrowImage->getWidth() * ((F32)arrow_height / (F32)mArrowImage->getHeight()));
-
-                                S32 left = mRect.getWidth() - mArrowImage->getWidth() - LLUI::sConfigGroup->getS32("DropShadowButton");
-
-                                gl_draw_scaled_image( left, 0, arrow_width, arrow_height, mArrowImage, LLColor4::white);
-                        }
-                }
         }
 }
 
@@ -481,7 +472,7 @@ BOOL LLComboBox::setCurrentByIndex( S32 index )
         BOOL found = mList->selectNthItem( index );
         if (found)
         {
-                setLabel(mList->getSimpleSelectedItem());
+                setLabel(mList->getSelectedItemLabel());
         }
         return found;
 }
@@ -497,6 +488,67 @@ S32 LLComboBox::getCurrentIndex() const
 }
 
 
+void LLComboBox::updateLayout()
+{
+        LLRect rect = getLocalRect();
+        if (mAllowTextEntry)
+        {
+                S32 shadow_size = LLUI::sConfigGroup->getS32("DropShadowButton");
+                mButton->setRect(LLRect( mRect.getWidth() - llmax(8,mArrowImage->getWidth(0)) - 2 * shadow_size,
+                                                                rect.mTop, rect.mRight, rect.mBottom));
+                mButton->setTabStop(FALSE);
+
+                if (!mTextEntry)
+                {
+                        LLRect text_entry_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
+                        text_entry_rect.mRight -= llmax(8,mArrowImage->getWidth(0)) + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
+                        // clear label on button
+                        LLString cur_label = mButton->getLabelSelected();
+                        mTextEntry = new LLLineEditor("combo_text_entry",
+                                                                                text_entry_rect,
+                                                                                "",
+                                                                                LLFontGL::sSansSerifSmall,
+                                                                                mMaxChars,
+                                                                                onTextCommit,
+                                                                                onTextEntry,
+                                                                                NULL,
+                                                                                this,
+                                                                                NULL,           // prevalidate func
+                                                                                LLViewBorder::BEVEL_NONE,
+                                                                                LLViewBorder::STYLE_LINE,
+                                                                                0);     // no border
+                        mTextEntry->setSelectAllonFocusReceived(TRUE);
+                        mTextEntry->setHandleEditKeysDirectly(TRUE);
+                        mTextEntry->setCommitOnFocusLost(FALSE);
+                        mTextEntry->setText(cur_label);
+                        mTextEntry->setIgnoreTab(TRUE);
+                        mTextEntry->setFollowsAll();
+                        addChild(mTextEntry);
+                }
+                else
+                {
+                        mTextEntry->setVisible(TRUE);
+                        mTextEntry->setMaxTextLength(mMaxChars);
+                }
+
+                // clear label on button
+                setLabel(LLString::null);
+
+                mButton->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP | FOLLOWS_RIGHT);
+        }
+        else if (!mAllowTextEntry)
+        {
+                mButton->setRect(rect);
+                mButton->setTabStop(TRUE);
+
+                if (mTextEntry)
+                {
+                        mTextEntry->setVisible(FALSE);
+                }
+                mButton->setFollowsAll();
+        }
+}
+
 void* LLComboBox::getCurrentUserdata()
 {
         LLScrollListItem* item = mList->getFirstSelected();
@@ -514,7 +566,7 @@ void LLComboBox::showList()
         LLCoordWindow window_size;
         getWindow()->getSize(&window_size);
         //HACK: shouldn't have to know about scale here
-        mList->arrange( 192, llfloor((F32)window_size.mY / LLUI::sGLScaleFactor.mV[VY]) - 50 );
+        mList->fitContents( 192, llfloor((F32)window_size.mY / LLUI::sGLScaleFactor.mV[VY]) - 50 );
 
         // Make sure that we can see the whole list
         LLRect root_view_local;
@@ -523,7 +575,9 @@ void LLComboBox::showList()
         
         LLRect rect = mList->getRect();
 
-        S32 list_width = mRect.getWidth() + SCROLLBAR_SIZE;
+        S32 min_width = mRect.getWidth();
+        S32 max_width = llmax(min_width, MAX_COMBO_WIDTH);
+        S32 list_width = llclamp(mList->getMaxContentWidth(), min_width, max_width);
 
         if (mListPosition == BELOW)
         {
@@ -583,12 +637,6 @@ void LLComboBox::showList()
                 mList->translate(0, -y);
         }
 
-        // pass mouse capture on to list if button is depressed
-        if (mButton->hasMouseCapture())
-        {
-                gFocusMgr.setMouseCapture(mList);
-        }
-        
         // NB: this call will trigger the focuslost callback which will hide the list, so do it first
         // before finally showing the list
 
@@ -604,24 +652,29 @@ void LLComboBox::showList()
         mButton->setToggleState(TRUE);
         mList->setVisible(TRUE);
         
-        gFocusMgr.setTopCtrl(mList);
+        setUseBoundingRect(TRUE);
+        gFocusMgr.setTopCtrl(this);
 }
 
 void LLComboBox::hideList()
 {
+        //*HACK: store the original value explicitly somewhere, not just in label
+        LLString orig_selection = mAllowTextEntry ? mTextEntry->getText() : mButton->getLabelSelected();
+
+        // assert selection in list
+        mList->selectItemByLabel(orig_selection, FALSE);
+
         mButton->setToggleState(FALSE);
         mList->setVisible(FALSE);
         mList->highlightNthItem(-1);
 
-        if( gFocusMgr.getTopCtrl() == mList )
+        setUseBoundingRect(FALSE);
+        if( gFocusMgr.getTopCtrl() == this )
         {
                 gFocusMgr.setTopCtrl(NULL);
         }
-
-        //mList->setFocus(FALSE);
 }
 
-
 //------------------------------------------------------------------
 // static functions
 //------------------------------------------------------------------
@@ -650,21 +703,20 @@ void LLComboBox::onButtonDown(void *userdata)
                         self->showList();
                 }
 
-                if (self->mKeyboardFocusOnClick && !self->hasFocus())
+                self->setFocus( TRUE );
+
+                // pass mouse capture on to list if button is depressed
+                if (self->mButton->hasMouseCapture())
                 {
-                        self->setFocus( TRUE );
+                        gFocusMgr.setMouseCapture(self->mList);
                 }
         }
         else
         {
-                // hide and release keyboard focus
                 self->hideList();
-
-                self->onCommit();
         }
-}
-
 
+}
 
 // static
 void LLComboBox::onItemSelected(LLUICtrl* item, void *userdata)
@@ -672,7 +724,7 @@ void LLComboBox::onItemSelected(LLUICtrl* item, void *userdata)
         // Note: item is the LLScrollListCtrl
         LLComboBox *self = (LLComboBox *) userdata;
 
-        const LLString& name = self->mList->getSimpleSelectedItem();
+        const LLString name = self->mList->getSelectedItemLabel();
 
         S32 cur_id = self->getCurrentIndex();
         if (cur_id != -1)
@@ -681,40 +733,24 @@ void LLComboBox::onItemSelected(LLUICtrl* item, void *userdata)
 
                 if (self->mAllowTextEntry)
                 {
-                        gFocusMgr.setKeyboardFocus(self->mTextEntry, NULL);
+                        gFocusMgr.setKeyboardFocus(self->mTextEntry);
                         self->mTextEntry->selectAll();
                 }
         }
         else
         {
                 // invalid selection, just restore existing value
-                self->mList->selectSimpleItem(self->mButton->getLabelSelected());
+                LLString orig_selection = self->mAllowTextEntry ? self->mTextEntry->getText() : self->mButton->getLabelSelected();
+
+                self->mList->selectItemByLabel(orig_selection);
         }
         self->onCommit();
 
         self->hideList();
 }
 
-// static
-void LLComboBox::onListFocusChanged(LLUICtrl* list, void* user_data)
-{
-        LLComboBox *self = (LLComboBox *) list->getParent();
-        // user not manipulating list or clicking on drop down button
-        if (!self->mList->hasFocus() && !self->mButton->hasMouseCapture())
-        {
-                //*HACK: store the original value explicitly somewhere, not just in label
-                LLString orig_selection = self->mAllowTextEntry ? self->mTextEntry->getText() : self->mButton->getLabelSelected();
-
-                self->hideList();
-
-                // reassert original selection
-                self->mList->selectSimpleItem(orig_selection, FALSE);
-        }
-}
-
 BOOL LLComboBox::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
 {
-
     LLString tool_tip;
 
         if (LLUI::sShowXUINames)
@@ -726,23 +762,19 @@ BOOL LLComboBox::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_
                 tool_tip = mToolTipMsg;
         }
 
-        if( getVisible() && pointInView( x, y ) ) 
+        if( !tool_tip.empty() )
         {
-                if( !tool_tip.empty() )
-                {
-                        msg = tool_tip;
-
-                        // Convert rect local to screen coordinates
-                        localPointToScreen( 
-                                0, 0, 
-                                &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
-                        localPointToScreen(
-                                mRect.getWidth(), mRect.getHeight(),
-                                &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
-                }
-                return TRUE;
+                msg = tool_tip;
+
+                // Convert rect local to screen coordinates
+                localPointToScreen( 
+                        0, 0, 
+                        &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+                localPointToScreen(
+                        mRect.getWidth(), mRect.getHeight(),
+                        &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
         }
-        return FALSE;
+        return TRUE;
 }
 
 BOOL LLComboBox::handleKeyHere(KEY key, MASK mask, BOOL called_from_parent)
@@ -793,63 +825,11 @@ BOOL LLComboBox::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent
 
 void LLComboBox::setAllowTextEntry(BOOL allow, S32 max_chars, BOOL set_tentative)
 {
-        LLRect rect( 0, mRect.getHeight(), mRect.getWidth(), 0);
-        if (allow && !mAllowTextEntry)
-        {
-                S32 shadow_size = LLUI::sConfigGroup->getS32("DropShadowButton");
-                mButton->setRect(LLRect( mRect.getWidth() - mArrowImageWidth - 2 * shadow_size,
-                                                                rect.mTop, rect.mRight, rect.mBottom));
-                mButton->setTabStop(FALSE);
-
-                // clear label on button
-                LLString cur_label = mButton->getLabelSelected();
-                setLabel(LLString::null);
-                if (!mTextEntry)
-                {
-                        LLRect text_entry_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
-                        text_entry_rect.mRight -= mArrowImageWidth + 2 * LLUI::sConfigGroup->getS32("DropShadowButton");
-                        mTextEntry = new LLLineEditor("combo_text_entry",
-                                                                                text_entry_rect,
-                                                                                "",
-                                                                                LLFontGL::sSansSerifSmall,
-                                                                                max_chars,
-                                                                                onTextCommit,
-                                                                                onTextEntry,
-                                                                                NULL,
-                                                                                this,
-                                                                                NULL,           // prevalidate func
-                                                                                LLViewBorder::BEVEL_NONE,
-                                                                                LLViewBorder::STYLE_LINE,
-                                                                                0);     // no border
-                        mTextEntry->setSelectAllonFocusReceived(TRUE);
-                        mTextEntry->setHandleEditKeysDirectly(TRUE);
-                        mTextEntry->setCommitOnFocusLost(FALSE);
-                        mTextEntry->setText(cur_label);
-                        mTextEntry->setIgnoreTab(TRUE);
-                        mTextEntry->setFollowsAll();
-                        addChild(mTextEntry);
-                        mMaxChars = max_chars;
-                }
-                else
-                {
-                        mTextEntry->setVisible(TRUE);
-                }
-
-                mButton->setFollows(FOLLOWS_BOTTOM | FOLLOWS_TOP | FOLLOWS_RIGHT);
-        }
-        else if (!allow && mAllowTextEntry)
-        {
-                mButton->setRect(rect);
-                mButton->setTabStop(TRUE);
-
-                if (mTextEntry)
-                {
-                        mTextEntry->setVisible(FALSE);
-                }
-                mButton->setFollowsAll();
-        }
         mAllowTextEntry = allow;
-        mTextEntryTentative = set_tentative;    
+        mTextEntryTentative = set_tentative;
+        mMaxChars = max_chars;
+
+        updateLayout();
 }
 
 void LLComboBox::setTextEntry(const LLStringExplicit& text)
@@ -875,7 +855,7 @@ void LLComboBox::onTextEntry(LLLineEditor* line_editor, void* user_data)
         if (key == KEY_BACKSPACE || 
                 key == KEY_DELETE)
         {
-                if (self->mList->selectSimpleItem(line_editor->getText(), FALSE))
+                if (self->mList->selectItemByLabel(line_editor->getText(), FALSE))
                 {
                         line_editor->setTentative(FALSE);
                 }
@@ -955,11 +935,11 @@ void LLComboBox::updateSelection()
                 }
         }
 
-        if (mList->selectSimpleItem(full_string, FALSE))
+        if (mList->selectItemByLabel(full_string, FALSE))
         {
                 mTextEntry->setTentative(FALSE);
         }
-        else if (!mList->selectSimpleItemByPrefix(left_wstring, FALSE))
+        else if (!mList->selectItemByPrefix(left_wstring, FALSE))
         {
                 mList->deselectAllItems();
                 mTextEntry->setText(wstring_to_utf8str(user_wstring));
@@ -967,7 +947,7 @@ void LLComboBox::updateSelection()
         }
         else
         {
-                LLWString selected_item = utf8str_to_wstring(mList->getSimpleSelectedItem());
+                LLWString selected_item = utf8str_to_wstring(mList->getSelectedItemLabel());
                 LLWString wtext = left_wstring + selected_item.substr(left_wstring.size(), selected_item.size());
                 mTextEntry->setText(wstring_to_utf8str(wtext));
                 mTextEntry->setSelection(left_wstring.size(), mTextEntry->getWText().size());
@@ -993,6 +973,10 @@ void LLComboBox::setFocus(BOOL b)
         if (b)
         {
                 mList->clearSearchString();
+                if (mList->getVisible())
+                {
+                        mList->setFocus(TRUE);
+                }
         }
 }
 
@@ -1048,7 +1032,7 @@ BOOL LLComboBox::setCurrentByID(const LLUUID& id)
 
         if (found)
         {
-                setLabel(mList->getSimpleSelectedItem());
+                setLabel(mList->getSelectedItemLabel());
         }
 
         return found;
@@ -1063,14 +1047,14 @@ BOOL LLComboBox::setSelectedByValue(LLSD value, BOOL selected)
         BOOL found = mList->setSelectedByValue(value, selected);
         if (found)
         {
-                setLabel(mList->getSimpleSelectedItem());
+                setLabel(mList->getSelectedItemLabel());
         }
         return found;
 }
 
-LLSD LLComboBox::getSimpleSelectedValue()
+LLSD LLComboBox::getSelectedValue()
 {
-        return mList->getSimpleSelectedValue();
+        return mList->getSelectedValue();
 }
 
 BOOL LLComboBox::isSelected(LLSD value)
@@ -1097,3 +1081,155 @@ BOOL LLComboBox::operateOnAll(EOperation op)
         }
         return FALSE;
 }
+
+
+
+//
+// LLFlyoutButton
+//
+
+const S32 FLYOUT_BUTTON_ARROW_WIDTH = 24;
+
+LLFlyoutButton::LLFlyoutButton(
+                const LLString& name, 
+                const LLRect &rect,
+                const LLString& label,
+                void (*commit_callback)(LLUICtrl*, void*) ,
+                void *callback_userdata)
+:               LLComboBox(name, rect, LLString::null, commit_callback, callback_userdata),
+                mToggleState(FALSE),
+                mActionButton(NULL)
+{
+        // Always use text box 
+        // Text label button
+        mActionButton = new LLButton("flyout_button_main",
+                                                                 LLRect(), label, NULL, LLString::null,
+                                                                 NULL, this);
+        mActionButton->setScaleImage(TRUE);
+
+        mActionButton->setClickedCallback(onActionButtonClick);
+        mActionButton->setFollowsAll();
+        mActionButton->setHAlign( LLFontGL::HCENTER );
+        mActionButton->setLabel(label);
+        addChild(mActionButton);
+
+        mActionButtonImage = LLUI::getUIImageByName("flyout_btn_left.tga");
+        mExpanderButtonImage = LLUI::getUIImageByName("flyout_btn_right.tga");
+        mActionButtonImageSelected = LLUI::getUIImageByName("flyout_btn_left_selected.tga");
+        mExpanderButtonImageSelected = LLUI::getUIImageByName("flyout_btn_right_selected.tga");
+
+        mActionButton->setImageSelected(mActionButtonImageSelected);
+        mActionButton->setImageUnselected(mActionButtonImage);
+        mActionButton->setImageDisabled(LLPointer<LLUIImage>(NULL));
+        mActionButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
+
+        mButton->setImageSelected(mExpanderButtonImageSelected);
+        mButton->setImageUnselected(mExpanderButtonImage);
+        mButton->setImageDisabled(LLPointer<LLUIImage>(NULL));
+        mButton->setImageDisabledSelected(LLPointer<LLUIImage>(NULL));
+        mButton->setRightHPad(6);
+
+        mBorder->setVisible(FALSE);
+
+        updateLayout();
+}
+
+//static 
+LLView* LLFlyoutButton::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
+{
+        LLString name = "flyout_button";
+        node->getAttributeString("name", name);
+
+        LLString label("");
+        node->getAttributeString("label", label);
+
+        LLRect rect;
+        createRect(node, rect, parent, LLRect());
+
+        LLUICtrlCallback callback = NULL;
+
+        LLFlyoutButton* flyout_button = new LLFlyoutButton(name,
+                                                        rect, 
+                                                        label,
+                                                        callback,
+                                                        NULL);
+
+        LLString list_position;
+        node->getAttributeString("list_position", list_position);
+        if (list_position == "below")
+        {
+                flyout_button->mListPosition = BELOW;
+        }
+        else if (list_position == "above")
+        {
+                flyout_button->mListPosition = ABOVE;
+        }
+        
+
+        flyout_button->initFromXML(node, parent);
+
+        LLXMLNodePtr child;
+        for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
+        {
+                if (child->hasName("flyout_button_item"))
+                {
+                        LLString label = child->getTextContents();
+
+                        LLString value = label;
+                        child->getAttributeString("value", value);
+
+                        flyout_button->add(label, LLSD(value) );
+                }
+        }
+
+        flyout_button->updateLayout();
+
+        return flyout_button;
+}
+
+void LLFlyoutButton::updateLayout()
+{
+        LLComboBox::updateLayout();
+
+        mButton->setOrigin(mRect.getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, 0);
+        mButton->reshape(FLYOUT_BUTTON_ARROW_WIDTH, mRect.getHeight());
+        mButton->setFollows(FOLLOWS_RIGHT | FOLLOWS_TOP | FOLLOWS_BOTTOM);
+        mButton->setTabStop(FALSE);
+        mButton->setImageOverlay(mListPosition == BELOW ? "down_arrow.tga" : "up_arrow.tga", LLFontGL::RIGHT);
+
+        mActionButton->setOrigin(0, 0);
+        mActionButton->reshape(mRect.getWidth() - FLYOUT_BUTTON_ARROW_WIDTH, mRect.getHeight());
+}
+
+//static 
+void LLFlyoutButton::onActionButtonClick(void *user_data)
+{
+        LLFlyoutButton* buttonp = (LLFlyoutButton*)user_data;
+        // remember last list selection?
+        buttonp->mList->deselect();
+        buttonp->onCommit();
+}
+
+void LLFlyoutButton::draw()
+{
+        mActionButton->setToggleState(mToggleState);
+        mButton->setToggleState(mToggleState);
+
+        //FIXME: this should be an attribute of comboboxes, whether they have a distinct label or
+        // the label reflects the last selected item, for now we have to manually remove the label
+        mButton->setLabel(LLString::null);
+        LLComboBox::draw();     
+}
+
+void LLFlyoutButton::setEnabled(BOOL enabled)
+{
+        mActionButton->setEnabled(enabled);
+        LLComboBox::setEnabled(enabled);
+}
+
+
+void LLFlyoutButton::setToggleState(BOOL state)
+{
+        mToggleState = state;
+}
+
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 6e5e4ab..2a70db2 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -80,6 +80,7 @@ public:
 
         virtual void    draw();
         virtual void    onFocusLost();
+        virtual void    onLostTop();
 
         virtual void    setEnabled(BOOL enabled);
 
@@ -107,21 +108,22 @@ public:
         void                    setAllowTextEntry(BOOL allow, S32 max_chars = 50, BOOL make_tentative = TRUE);
         void                    setTextEntry(const LLStringExplicit& text);
 
-        void                    add(const LLString& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);  // add item "name" to menu
-        void                    add(const LLString& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-        void                    add(const LLString& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
-        void                    add(const LLString& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+        LLScrollListItem*       add(const LLString& name, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);  // add item "name" to menu
+        LLScrollListItem*       add(const LLString& name, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+        LLScrollListItem*       add(const LLString& name, void* userdata, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+        LLScrollListItem*       add(const LLString& name, LLSD value, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE);
+        LLScrollListItem*       addSeparator(EAddPosition pos = ADD_BOTTOM);
         BOOL                    remove( S32 index );    // remove item by index, return TRUE if found and removed
         void                    removeall() { clearRows(); }
 
         void                    sortByName(); // Sort the entries in the combobox by name
 
-        // Select current item by name using selectSimpleItem.  Returns FALSE if not found.
+        // Select current item by name using selectItemByLabel.  Returns FALSE if not found.
         BOOL                    setSimple(const LLStringExplicit& name);
         // Get name of current item. Returns an empty string if not found.
-        const LLString& getSimple() const;
+        const LLString  getSimple() const;
         // Get contents of column x of selected row
-        const LLString& getSimpleSelectedItem(S32 column = 0) const;
+        const LLString getSelectedItemLabel(S32 column = 0) const;
 
         // Sets the label, which doesn't have to exist in the label.
         // This is probably a UI abuse.
@@ -132,6 +134,8 @@ public:
         BOOL                    setCurrentByIndex( S32 index );
         S32                             getCurrentIndex() const;
 
+        virtual void    updateLayout();
+
         //========================================================================
         LLCtrlSelectionInterface* getSelectionInterface()       { return (LLCtrlSelectionInterface*)this; };
         LLCtrlListInterface* getListInterface()                         { return (LLCtrlListInterface*)this; };
@@ -156,7 +160,7 @@ public:
         virtual BOOL    setCurrentByID( const LLUUID& id );
         virtual LLUUID  getCurrentID();                         // LLUUID::null if no items in menu
         virtual BOOL    setSelectedByValue(LLSD value, BOOL selected);
-        virtual LLSD    getSimpleSelectedValue();
+        virtual LLSD    getSelectedValue();
         virtual BOOL    isSelected(LLSD value);
         virtual BOOL    operateOnSelection(EOperation op);
         virtual BOOL    operateOnAll(EOperation op);
@@ -172,7 +176,6 @@ public:
 
         static void             onButtonDown(void *userdata);
         static void             onItemSelected(LLUICtrl* item, void *userdata);
-        static void             onListFocusChanged(LLUICtrl* item, void *userdata);
         static void             onTextEntry(LLLineEditor* line_editor, void* user_data);
         static void             onTextCommit(LLUICtrl* caller, void* user_data);
 
@@ -183,12 +186,10 @@ public:
 protected:
         LLButton*                       mButton;
         LLScrollListCtrl*       mList;
+        S32                                     mButtonPadding;
         LLViewBorder*           mBorder;
-        BOOL                            mKeyboardFocusOnClick;
-        BOOL                            mDrawArrow;
         LLLineEditor*           mTextEntry;
         LLPointer<LLImageGL>    mArrowImage;
-        S32                                     mArrowImageWidth;
         BOOL                            mAllowTextEntry;
         S32                                     mMaxChars;
         BOOL                            mTextEntryTentative;
@@ -197,4 +198,36 @@ protected:
         void                            (*mTextEntryCallback)(LLLineEditor*, void*);
 };
 
+class LLFlyoutButton : public LLComboBox
+{
+public:
+        LLFlyoutButton(
+                const LLString& name, 
+                const LLRect &rect,
+                const LLString& label,
+                void (*commit_callback)(LLUICtrl*, void*) = NULL,
+                void *callback_userdata = NULL);
+
+        virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_FLYOUT_BUTTON; }
+        virtual LLString getWidgetTag() const { return LL_FLYOUT_BUTTON_TAG; }
+
+        virtual void    updateLayout();
+        virtual void    draw();
+        virtual void    setEnabled(BOOL enabled);
+
+        void setToggleState(BOOL state);
+
+        static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
+        static void             onActionButtonClick(void *userdata);
+        static void             onSelectAction(LLUICtrl* ctrl, void *userdata);
+
+protected:
+        LLButton*                               mActionButton;
+        LLPointer<LLUIImage>    mActionButtonImage;
+        LLPointer<LLUIImage>    mExpanderButtonImage;
+        LLPointer<LLUIImage>    mActionButtonImageSelected;
+        LLPointer<LLUIImage>    mExpanderButtonImageSelected;
+        BOOL                                    mToggleState;
+};
+
 #endif
diff --git a/linden/indra/llui/llctrlselectioninterface.cpp b/linden/indra/llui/llctrlselectioninterface.cpp
index 6fb5df3..996f5b3 100644
--- a/linden/indra/llui/llctrlselectioninterface.cpp
+++ b/linden/indra/llui/llctrlselectioninterface.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llctrlselectioninterface.h b/linden/indra/llui/llctrlselectioninterface.h
index 20caa1e..121d971 100644
--- a/linden/indra/llui/llctrlselectioninterface.h
+++ b/linden/indra/llui/llctrlselectioninterface.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -68,7 +68,7 @@ public:
                         BOOL    selectByValue(LLSD value);
                         BOOL    deselectByValue(LLSD value);
         virtual BOOL    setSelectedByValue(LLSD value, BOOL selected) = 0;
-        virtual LLSD    getSimpleSelectedValue() = 0;
+        virtual LLSD    getSelectedValue() = 0;
 
         virtual BOOL    isSelected(LLSD value) = 0;
 
diff --git a/linden/indra/llui/lldraghandle.cpp b/linden/indra/llui/lldraghandle.cpp
index fb91201..032cb91 100644
--- a/linden/indra/llui/lldraghandle.cpp
+++ b/linden/indra/llui/lldraghandle.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lldraghandle.h b/linden/indra/llui/lldraghandle.h
index c085991..a48c0f7 100644
--- a/linden/indra/llui/lldraghandle.h
+++ b/linden/indra/llui/lldraghandle.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -54,7 +54,6 @@ public:
 
         virtual void    setTitle( const LLString& title ) = 0;
         virtual const LLString& getTitle() const = 0;
-        virtual void    draw() = 0;
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE) = 0;
 
         virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/llui/lleditmenuhandler.cpp b/linden/indra/llui/lleditmenuhandler.cpp
index b359098..6291088 100644
--- a/linden/indra/llui/lleditmenuhandler.cpp
+++ b/linden/indra/llui/lleditmenuhandler.cpp
@@ -12,12 +12,12 @@
 * ("GPL"), unless you have obtained a separate licensing agreement
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlife.com/developers/opensource/gplv2
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
 * 
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlife.com/developers/opensource/flossexception
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lleditmenuhandler.h b/linden/indra/llui/lleditmenuhandler.h
index 394d27c..ef9b1dd 100644
--- a/linden/indra/llui/lleditmenuhandler.h
+++ b/linden/indra/llui/lleditmenuhandler.h
@@ -12,12 +12,12 @@
 * ("GPL"), unless you have obtained a separate licensing agreement
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlife.com/developers/opensource/gplv2
+* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
 * 
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at http://secondlife.com/developers/opensource/flossexception
+* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
 * 
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 8ff3c48..1500f9f 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -128,7 +128,11 @@ LLFloater::handle_map_t	LLFloater::sFloaterMap;
 
 LLFloaterView* gFloaterView = NULL;
 
-LLFloater::LLFloater() 
+LLFloater::LLFloater() :
+        //FIXME: we should initialize *all* member variables here
+        mResizable(FALSE),
+        mDragOnLeft(FALSE)
+
 {
         // automatically take focus when opened
         mAutoFocus = TRUE;
@@ -215,9 +219,14 @@ void LLFloater::init(const LLString& title,
         }
         mButtonScale = 1.f;
 
-        LLPanel::deleteAllChildren();
+        BOOL need_border = mBorder != NULL;
+
+        // this will delete mBorder too
+        deleteAllChildren();
+        // make sure we don't have a pointer to an old, deleted border  
+        mBorder = NULL;
         //sjb: HACK! we had a border which was just deleted, so re-create it
-        if (mBorder != NULL)
+        if (need_border)
         {
                 addBorder();
         }
@@ -609,7 +618,7 @@ void LLFloater::releaseFocus()
 
         if( gFocusMgr.childHasKeyboardFocus( this ) )
         {
-                gFocusMgr.setKeyboardFocus(NULL, NULL);
+                gFocusMgr.setKeyboardFocus(NULL);
         }
 
         if( gFocusMgr.childHasMouseCapture( this ) )
@@ -1026,13 +1035,10 @@ void LLFloater::setHost(LLMultiFloater* host)
                 {
                         mButtonsEnabled[BUTTON_TEAR_OFF] = TRUE;
                 }
-
-                mIsFocusRoot = FALSE;
         }
         else if (!mHostHandle.isDead() && !host)
         {
                 mButtonScale = 1.f;
-                mIsFocusRoot = TRUE;
                 //mButtonsEnabled[BUTTON_TEAR_OFF] = FALSE;
         }
         updateButtons();
@@ -1260,6 +1266,7 @@ void LLFloater::show(LLFloater* floaterp)
 {
         if (floaterp) 
         {
+                gFocusMgr.triggerFocusFlash();
                 floaterp->open();
                 if (floaterp->getHost())
                 {
@@ -2245,7 +2252,8 @@ void LLFloaterView::refresh()
                 LLFloater* floaterp = (LLFloater*)*child_it;
                 if( floaterp->getVisible() )
                 {
-                        adjustToFitScreen(floaterp, TRUE);
+                        // minimized floaters are kept fully onscreen
+                        adjustToFitScreen(floaterp, !floaterp->isMinimized());
                 }
         }
 }
@@ -2605,9 +2613,9 @@ void LLMultiFloater::draw()
                 for (S32 i = 0; i < mTabContainer->getTabCount(); i++)
                 {
                         LLFloater* floaterp = (LLFloater*)mTabContainer->getPanelByIndex(i);
-                        if (floaterp->getTitle() != mTabContainer->getPanelTitle(i))
+                        if (floaterp->getShortTitle() != mTabContainer->getPanelTitle(i))
                         {
-                                mTabContainer->setPanelTitle(i, floaterp->getTitle());
+                                mTabContainer->setPanelTitle(i, floaterp->getShortTitle());
                         }
                 }
                 LLFloater::draw();
@@ -2725,7 +2733,7 @@ void LLMultiFloater::addFloater(LLFloater* floaterp, BOOL select_added_floater,
 
         if ( select_added_floater )
         {
-                mTabContainer->selectLastTab();
+                mTabContainer->selectTabPanel(floaterp);
         }
 
         floaterp->setHost(this);
@@ -2970,8 +2978,9 @@ void LLMultiFloater::updateResizeLimits()
                 // make sure upper left corner doesn't move
                 translate(0, cur_height - mRect.getHeight());
 
-                // Try to keep whole view onscreen, don't allow partial offscreen.
-                gFloaterView->adjustToFitScreen(this, FALSE);
+                // make sure this window is visible on screen when it has been modified
+                // (tab added, etc)
+                gFloaterView->adjustToFitScreen(this, TRUE);
         }
 }
 
diff --git a/linden/indra/llui/llfloater.h b/linden/indra/llui/llfloater.h
index 3a34057..56b0e6e 100644
--- a/linden/indra/llui/llfloater.h
+++ b/linden/indra/llui/llfloater.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llfocusmgr.cpp b/linden/indra/llui/llfocusmgr.cpp
index 065c206..efca3d8 100644
--- a/linden/indra/llui/llfocusmgr.cpp
+++ b/linden/indra/llui/llfocusmgr.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -42,11 +42,10 @@ LLFocusMgr gFocusMgr;
 LLFocusMgr::LLFocusMgr()
         :
         mLockedView( NULL ),
-        mKeyboardLockedFocusLostCallback( NULL ),
         mMouseCaptor( NULL ),
         mKeyboardFocus( NULL ),
+        mLastKeyboardFocus( NULL ),
         mDefaultKeyboardFocus( NULL ),
-        mKeyboardFocusLostCallback( NULL ),
         mTopCtrl( NULL ),
         mFocusWeight(0.f),
         mAppHasFocus(TRUE)   // Macs don't seem to notify us that we've gotten focus, so default to true
@@ -75,12 +74,11 @@ void LLFocusMgr::releaseFocusIfNeeded( LLView* view )
                 if (view == mLockedView)
                 {
                         mLockedView = NULL;
-                        mKeyboardLockedFocusLostCallback = NULL;
-                        setKeyboardFocus( NULL, NULL );
+                        setKeyboardFocus( NULL );
                 }
                 else
                 {
-                        setKeyboardFocus( mLockedView, mKeyboardLockedFocusLostCallback );
+                        setKeyboardFocus( mLockedView );
                 }
         }
 
@@ -91,7 +89,7 @@ void LLFocusMgr::releaseFocusIfNeeded( LLView* view )
 }
 
 
-void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, FocusLostCallback on_focus_lost, BOOL lock)
+void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, BOOL lock)
 {
         if (mLockedView && 
                 (new_focus == NULL || 
@@ -101,28 +99,27 @@ void LLFocusMgr::setKeyboardFocus(LLUICtrl* new_focus, FocusLostCallback on_focu
                 // or one of its descendants
                 return;
         }
-        FocusLostCallback old_callback = mKeyboardFocusLostCallback;
-        mKeyboardFocusLostCallback = on_focus_lost;
 
         //llinfos << "Keyboard focus handled by " << (new_focus ? new_focus->getName() : "nothing") << llendl;
 
         if( new_focus != mKeyboardFocus )
         {
-                LLUICtrl* old_focus = mKeyboardFocus;
+                mLastKeyboardFocus = mKeyboardFocus;
                 mKeyboardFocus = new_focus;
 
+                if( mLastKeyboardFocus )
+                {
+                        mLastKeyboardFocus->onFocusLost();
+                }
+
                 // clear out any existing flash
                 if (new_focus)
                 {
                         mFocusWeight = 0.f;
+                        new_focus->onFocusReceived();
                 }
                 mFocusTimer.reset();
 
-                if( old_callback )
-                {
-                        old_callback( old_focus );
-                }
-
                 #ifdef _DEBUG
                         mKeyboardFocusName = new_focus ? new_focus->getName() : "none";
                 #endif
@@ -204,13 +201,11 @@ void LLFocusMgr::removeKeyboardFocusWithoutCallback( LLView* focus )
         if (focus == mLockedView)
         {
                 mLockedView = NULL;
-                mKeyboardLockedFocusLostCallback = NULL;
         }
 
         if( mKeyboardFocus == focus )
         {
                 mKeyboardFocus = NULL;
-                mKeyboardFocusLostCallback = NULL;
                 #ifdef _DEBUG
                         mKeyboardFocusName = "none";
                 #endif
@@ -293,13 +288,19 @@ BOOL LLFocusMgr::childIsTopCtrl( LLView* parent )
 // set new_top = NULL to release top_view.
 void LLFocusMgr::setTopCtrl( LLUICtrl* new_top  )
 {
-        if( new_top != mTopCtrl )
+        LLUICtrl* old_top = mTopCtrl;
+        if( new_top != old_top )
         {
                 mTopCtrl = new_top;
 
                 #ifdef _DEBUG
                         mTopCtrlName = new_top ? new_top->getName() : "none";
                 #endif
+
+                if (old_top)
+                {
+                        old_top->onLostTop();
+                }
         }
 }
 
@@ -317,13 +318,11 @@ void LLFocusMgr::removeTopCtrlWithoutCallback( LLUICtrl* top_view )
 void LLFocusMgr::lockFocus()
 {
         mLockedView = mKeyboardFocus; 
-        mKeyboardLockedFocusLostCallback = mKeyboardFocusLostCallback; 
 }
 
 void LLFocusMgr::unlockFocus()
 {
         mLockedView = NULL; 
-        mKeyboardLockedFocusLostCallback = NULL;
 }
 
 F32 LLFocusMgr::getFocusFlashAmt()
@@ -356,9 +355,9 @@ void LLFocusMgr::setAppHasFocus(BOOL focus)
         }
         
         // release focus from "top ctrl"s, which generally hides them
-        if (!focus && mTopCtrl && mTopCtrl->hasFocus())
+        if (!focus && mTopCtrl)
         {
-                mTopCtrl->setFocus(FALSE);
+                setTopCtrl(NULL);
         }
         mAppHasFocus = focus; 
 }
diff --git a/linden/indra/llui/llfocusmgr.h b/linden/indra/llui/llfocusmgr.h
index 02f588e..3bd5b35 100644
--- a/linden/indra/llui/llfocusmgr.h
+++ b/linden/indra/llui/llfocusmgr.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -44,8 +44,6 @@ class LLMouseHandler;
 class LLFocusMgr
 {
 public:
-        typedef void (*FocusLostCallback)(LLUICtrl*);
-
         LLFocusMgr();
         ~LLFocusMgr();
 
@@ -56,11 +54,11 @@ public:
         BOOL                    childHasMouseCapture( LLView* parent );
 
         // Keyboard Focus
-        void                    setKeyboardFocus(LLUICtrl* new_focus, FocusLostCallback on_focus_lost, BOOL lock = FALSE);              // new_focus = NULL to release the focus.
+        void                    setKeyboardFocus(LLUICtrl* new_focus, BOOL lock = FALSE);               // new_focus = NULL to release the focus.
         LLUICtrl*               getKeyboardFocus() const { return mKeyboardFocus; }  
+        LLUICtrl*               getLastKeyboardFocus() const { return mLastKeyboardFocus; }  
         BOOL                    childHasKeyboardFocus( const LLView* parent ) const;
         void                    removeKeyboardFocusWithoutCallback( LLView* focus );
-        FocusLostCallback getFocusCallback() { return mKeyboardFocusLostCallback; }
         F32                             getFocusTime() const { return mFocusTimer.getElapsedTimeF32(); }
         F32                             getFocusFlashAmt();
         LLColor4                getFocusColor();
@@ -90,15 +88,14 @@ public:
 
 protected:
         LLUICtrl*                       mLockedView;
-        FocusLostCallback mKeyboardLockedFocusLostCallback;
 
         // Mouse Captor
         LLMouseHandler*         mMouseCaptor;                           // Mouse events are premptively routed to this object
 
         // Keyboard Focus
         LLUICtrl*                       mKeyboardFocus;                         // Keyboard events are preemptively routed to this object
+        LLUICtrl*                       mLastKeyboardFocus;                     // who last had focus
         LLUICtrl*                       mDefaultKeyboardFocus;
-        FocusLostCallback       mKeyboardFocusLostCallback;     // The object to which keyboard events are routed is called before another object takes its place
 
         // Top View
         LLUICtrl*                       mTopCtrl;
diff --git a/linden/indra/llui/llhtmlhelp.h b/linden/indra/llui/llhtmlhelp.h
index 36324d0..d4ec9e3 100644
--- a/linden/indra/llui/llhtmlhelp.h
+++ b/linden/indra/llui/llhtmlhelp.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -37,7 +37,6 @@ class LLHtmlHelp
 public:
         virtual ~LLHtmlHelp() {}
         virtual void show(std::string start_url, std::string title) = 0;
-        virtual BOOL getFloaterOpened()=0;
 };
 
 #endif  // LL_LLFLOATERHTMLHELP_H
diff --git a/linden/indra/llui/lliconctrl.cpp b/linden/indra/llui/lliconctrl.cpp
index 40272ee..79982c6 100644
--- a/linden/indra/llui/lliconctrl.cpp
+++ b/linden/indra/llui/lliconctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -88,18 +88,11 @@ void LLIconCtrl::draw()
 {
         if( getVisible() ) 
         {
-                // Border
-                BOOL has_image = !mImageID.isNull();
-
-                if( has_image )
+                if( mImagep.notNull() )
                 {
-                        if( mImagep.notNull() )
-                        {
-                                gl_draw_scaled_image(0, 0, 
-                                                                         mRect.getWidth(), mRect.getHeight(), 
-                                                                         mImagep,
-                                                                         mColor );
-                        }
+                        mImagep->draw(0, 0, 
+                                                        mRect.getWidth(), mRect.getHeight(), 
+                                                        mColor );
                 }
 
                 LLUICtrl::draw();
@@ -154,6 +147,7 @@ LLView* LLIconCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
         LLUICtrlFactory::getAttributeColor(node,"color", color);
 
         LLIconCtrl* icon = new LLIconCtrl(name, rect, image_id);
+
         icon->setColor(color);
 
         icon->initFromXML(node, parent);
diff --git a/linden/indra/llui/lliconctrl.h b/linden/indra/llui/lliconctrl.h
index 0cd43bb..f767b3c 100644
--- a/linden/indra/llui/lliconctrl.h
+++ b/linden/indra/llui/lliconctrl.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -73,7 +73,7 @@ protected:
         LLColor4                mColor;
         LLString                mImageName;
         LLUUID                  mImageID;
-        LLPointer<LLImageGL>    mImagep;
+        LLPointer<LLUIImage>    mImagep;
 };
 
 #endif
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 3adde76..1d157d2 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -233,7 +233,7 @@ LLColor3 LLKeywords::readColor( const LLString& s )
 
 // Walk through a string, applying the rules specified by the keyword token list and
 // create a list of color segments.
-void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWString& wtext)
+void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWString& wtext, const LLColor4 &defaultColor)
 {
         std::for_each(seg_list->begin(), seg_list->end(), DeletePointer());
         seg_list->clear();
@@ -245,7 +245,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
         
         S32 text_len = wtext.size();
 
-        seg_list->push_back( new LLTextSegment( LLColor3(0,0,0), 0, text_len ) );
+        seg_list->push_back( new LLTextSegment( LLColor3(defaultColor), 0, text_len ) ); 
 
         const llwchar* base = wtext.c_str();
         const llwchar* cur = base;
@@ -299,7 +299,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                                 //llinfos << "Seg: [" << (char*)LLString( base, seg_start, seg_end-seg_start) << "]" << llendl;
                                                 LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
                                                 text_segment->setToken( cur_token );
-                                                insertSegment( seg_list, text_segment, text_len);
+                                                insertSegment( seg_list, text_segment, text_len, defaultColor);
                                                 line_done = TRUE; // to break out of second loop.
                                                 break;
                                         }
@@ -409,7 +409,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
                                         //llinfos << "Seg: [" << (char*)LLString( base, seg_start, seg_end-seg_start ) << "]" << llendl;
                                         LLTextSegment* text_segment = new LLTextSegment( cur_delimiter->getColor(), seg_start, seg_end );
                                         text_segment->setToken( cur_delimiter );
-                                        insertSegment( seg_list, text_segment, text_len);
+                                        insertSegment( seg_list, text_segment, text_len, defaultColor);
 
                                         // Note: we don't increment cur, since the end of one delimited seg may be immediately
                                         // followed by the start of another one.
@@ -442,7 +442,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 
                                                 LLTextSegment* text_segment = new LLTextSegment( cur_token->getColor(), seg_start, seg_end );
                                                 text_segment->setToken( cur_token );
-                                                insertSegment( seg_list, text_segment, text_len);
+                                                insertSegment( seg_list, text_segment, text_len, defaultColor);
                                         }
                                         cur += seg_len; 
                                         continue;
@@ -457,7 +457,7 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
         }
 }
 
-void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegment* new_segment, S32 text_len )
+void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor )
 {
         LLTextSegment* last = seg_list->back();
         S32 new_seg_end = new_segment->getEnd();
@@ -475,7 +475,7 @@ void LLKeywords::insertSegment(std::vector<LLTextSegment*>* seg_list, LLTextSegm
 
         if( new_seg_end < text_len )
         {
-                seg_list->push_back( new LLTextSegment( LLColor3(0,0,0), new_seg_end, text_len ) );
+                seg_list->push_back( new LLTextSegment( defaultColor, new_seg_end, text_len ) );
         }
 }
 
diff --git a/linden/indra/llui/llkeywords.h b/linden/indra/llui/llkeywords.h
index e6ff029..d5d7302 100644
--- a/linden/indra/llui/llkeywords.h
+++ b/linden/indra/llui/llkeywords.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -84,7 +84,7 @@ public:
         BOOL            loadFromFile(const LLString& filename);
         BOOL            isLoaded()      { return mLoaded; }
 
-        void            findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text );
+        void            findSegments(std::vector<LLTextSegment *> *seg_list, const LLWString& text, const LLColor4 &defaultColor );
 
 #ifdef _DEBUG
         void            dump();
@@ -98,7 +98,7 @@ public:
 
 private:
         LLColor3        readColor(const LLString& s);
-        void            insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len);
+        void            insertSegment(std::vector<LLTextSegment *> *seg_list, LLTextSegment* new_segment, S32 text_len, const LLColor4 &defaultColor);
 
 private:
         BOOL                                             mLoaded;
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 2851beb..88c8d75 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -72,6 +72,15 @@ const S32   SCROLL_INCREMENT_DEL = 4;	// make space for baskspacing
 const F32   AUTO_SCROLL_TIME = 0.05f;
 const F32       LABEL_HPAD = 5.f;
 
+const F32       PREEDIT_MARKER_BRIGHTNESS = 0.4f;
+const S32       PREEDIT_MARKER_GAP = 1;
+const S32       PREEDIT_MARKER_POSITION = 2;
+const S32       PREEDIT_MARKER_THICKNESS = 1;
+const F32       PREEDIT_STANDOUT_BRIGHTNESS = 0.6f;
+const S32       PREEDIT_STANDOUT_GAP = 1;
+const S32       PREEDIT_STANDOUT_POSITION = 2;
+const S32       PREEDIT_STANDOUT_THICKNESS = 2;
+
 // This is a friend class of and is only used by LLLineEditor
 class LLLineEditorRollback
 {
@@ -119,7 +128,7 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
                                                    S32 max_length_bytes,
                                                    void (*commit_callback)(LLUICtrl* caller, void* user_data ),
                                                    void (*keystroke_callback)(LLLineEditor* caller, void* user_data ),
-                                                   void (*focus_lost_callback)(LLUICtrl* caller, void* user_data ),
+                                                   void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data ),
                                                    void* userdata,
                                                    LLLinePrevalidateFunc prevalidate_func,
                                                    LLViewBorder::EBevel border_bevel,
@@ -127,7 +136,6 @@ LLLineEditor::LLLineEditor(const LLString& name, const LLRect& rect,
                                                    S32 border_thickness)
         :
                 LLUICtrl( name, rect, TRUE, commit_callback, userdata, FOLLOWS_TOP | FOLLOWS_LEFT ),
-                mMaxLengthChars(max_length_bytes),
                 mMaxLengthBytes(max_length_bytes),
                 mCursorPos( 0 ),
                 mScrollHPos( 0 ),
@@ -223,12 +231,19 @@ LLString LLLineEditor::getWidgetTag() const
         return LL_LINE_EDITOR_TAG;
 }
 
-void LLLineEditor::onFocusLost()
+void LLLineEditor::onFocusReceived()
 {
-        // Need to notify early when loosing focus.
-        getWindow()->allowLanguageTextInput(FALSE);
+        LLUICtrl::onFocusReceived();
+        updateAllowingLanguageInput();
+}
 
-        LLUICtrl::onFocusLost();
+void LLLineEditor::onFocusLost()
+{
+        // The call to updateAllowLanguageInput()
+        // when loosing the keyboard focus *may*
+        // indirectly invoke handleUnicodeCharHere(), 
+        // so it must be called before onCommit.
+        updateAllowingLanguageInput();
 
         if( mCommitOnFocusLost && mText.getString() != mPrevText) 
         {
@@ -241,6 +256,8 @@ void LLLineEditor::onFocusLost()
         }
 
         getWindow()->showCursorFromMouseMove();
+
+        LLUICtrl::onFocusLost();
 }
 
 void LLLineEditor::onCommit()
@@ -301,6 +318,7 @@ void LLLineEditor::setEnabled(BOOL enabled)
 {
         mReadOnly = !enabled;
         setTabStop(!mReadOnly);
+        updateAllowingLanguageInput();
 }
 
 
@@ -308,7 +326,6 @@ void LLLineEditor::setMaxTextLength(S32 max_text_length)
 {
         S32 max_len = llmax(0, max_text_length);
         mMaxLengthBytes = max_len;
-        mMaxLengthChars = max_len;
 } 
 
 void LLLineEditor::setBorderWidth(S32 left, S32 right)
@@ -334,18 +351,22 @@ void LLLineEditor::setText(const LLStringExplicit &new_text)
 
         // Check to see if entire field is selected.
         S32 len = mText.length();
-        BOOL allSelected = (len > 0) && (( mSelectionStart == 0 && mSelectionEnd == len ) 
-                || ( mSelectionStart == len && mSelectionEnd == 0 ));
+        BOOL all_selected = (len > 0)
+                && (( mSelectionStart == 0 && mSelectionEnd == len ) 
+                        || ( mSelectionStart == len && mSelectionEnd == 0 ));
+
+        // Do safe truncation so we don't split multi-byte characters
+        // also consider entire string selected when mSelectAllonFocusReceived is set on an empty, focused line editor
+        all_selected = all_selected || (len == 0 && hasFocus() && mSelectAllonFocusReceived);
 
         LLString truncated_utf8 = new_text;
         if (truncated_utf8.size() > (U32)mMaxLengthBytes)
-        {
-                utf8str_truncate(truncated_utf8, mMaxLengthBytes);
+        {       
+                truncated_utf8 = utf8str_truncate(new_text, mMaxLengthBytes);
         }
         mText.assign(truncated_utf8);
-        mText.truncate(mMaxLengthChars);
 
-        if (allSelected)
+        if (all_selected)
         {
                 // ...keep whole thing selected
                 selectAll();
@@ -735,17 +756,12 @@ void LLLineEditor::addChar(const llwchar uni_char)
                 mText.erase(getCursor(), 1);
         }
 
-        S32 length_chars = mText.length();
-        S32 cur_bytes = mText.getString().size();;
+        S32 cur_bytes = mText.getString().size();
         S32 new_bytes = wchar_utf8_length(new_c);
 
         BOOL allow_char = TRUE;
 
-        // Inserting character
-        if (length_chars == mMaxLengthChars)
-        {
-                allow_char = FALSE;
-        }
+        // Check byte length limit
         if ((new_bytes + cur_bytes) > mMaxLengthBytes)
         {
                 allow_char = FALSE;
@@ -794,6 +810,12 @@ void LLLineEditor::setSelection(S32 start, S32 end)
         setCursor(start);
 }
 
+void LLLineEditor::setDrawAsterixes(BOOL b)
+{
+        mDrawAsterixes = b;
+        updateAllowingLanguageInput();
+}
+
 S32 LLLineEditor::prevWordPos(S32 cursorPos) const
 {
         const LLWString& wtext = mText.getWString();
@@ -1022,13 +1044,11 @@ void LLLineEditor::paste()
 
                         // Insert the string
 
-                        //check to see that the size isn't going to be larger than the
-                        //max number of characters or bytes
+                        // Check to see that the size isn't going to be larger than the max number of bytes
                         U32 available_bytes = mMaxLengthBytes - wstring_utf8_length(mText);
-                        size_t available_chars = mMaxLengthChars - mText.length();
 
                         if ( available_bytes < (U32) wstring_utf8_length(clean_string) )
-                        {
+                        {       // Doesn't all fit
                                 llwchar current_symbol = clean_string[0];
                                 U32 wchars_that_fit = 0;
                                 U32 total_bytes = wchar_utf8_length(current_symbol);
@@ -1043,20 +1063,13 @@ void LLLineEditor::paste()
                                         current_symbol = clean_string[++wchars_that_fit];
                                         total_bytes += wchar_utf8_length(current_symbol);
                                 }
-
+                                // Truncate the clean string at the limit of what will fit
                                 clean_string = clean_string.substr(0, wchars_that_fit);
                                 reportBadKeystroke();
                         }
-                        else if (available_chars < clean_string.length())
-                        {
-                                // We can't insert all the characters.  Insert as many as possible
-                                // but make a noise to alert the user. JC
-                                clean_string = clean_string.substr(0, available_chars);
-                                reportBadKeystroke();
-                        }
 
                         mText.insert(getCursor(), clean_string);
-                        setCursor(llmin(mMaxLengthChars, getCursor() + (S32)clean_string.length()));
+                        setCursor( getCursor() + (S32)clean_string.length() );
                         deselect();
 
                         // Validate new string and rollback the if needed.
@@ -1523,6 +1536,41 @@ void LLLineEditor::draw()
         }
         LLColor4 label_color = mTentativeFgColor;
 
+        if (hasPreeditString())
+        {
+                // Draw preedit markers.  This needs to be before drawing letters.
+                for (U32 i = 0; i < mPreeditStandouts.size(); i++)
+                {
+                        const S32 preedit_left = mPreeditPositions[i];
+                        const S32 preedit_right = mPreeditPositions[i + 1];
+                        if (preedit_right > mScrollHPos)
+                        {
+                                S32 preedit_pixels_left = findPixelNearestPos(llmax(preedit_left, mScrollHPos) - getCursor());
+                                S32 preedit_pixels_right = llmin(findPixelNearestPos(preedit_right - getCursor()), background.mRight);
+                                if (preedit_pixels_left >= background.mRight)
+                                {
+                                        break;
+                                }
+                                if (mPreeditStandouts[i])
+                                {
+                                        gl_rect_2d(preedit_pixels_left + PREEDIT_STANDOUT_GAP,
+                                                background.mBottom + PREEDIT_STANDOUT_POSITION,
+                                                preedit_pixels_right - PREEDIT_STANDOUT_GAP - 1,
+                                                background.mBottom + PREEDIT_STANDOUT_POSITION - PREEDIT_STANDOUT_THICKNESS,
+                                                (text_color * PREEDIT_STANDOUT_BRIGHTNESS + bg_color * (1 - PREEDIT_STANDOUT_BRIGHTNESS)).setAlpha(1.0f));
+                                }
+                                else
+                                {
+                                        gl_rect_2d(preedit_pixels_left + PREEDIT_MARKER_GAP,
+                                                background.mBottom + PREEDIT_MARKER_POSITION,
+                                                preedit_pixels_right - PREEDIT_MARKER_GAP - 1,
+                                                background.mBottom + PREEDIT_MARKER_POSITION - PREEDIT_MARKER_THICKNESS,
+                                                (text_color * PREEDIT_MARKER_BRIGHTNESS + bg_color * (1 - PREEDIT_MARKER_BRIGHTNESS)).setAlpha(1.0f));
+                                }
+                        }
+                }
+        }
+
         S32 rendered_text = 0;
         F32 rendered_pixels_right = (F32)mMinHPixels;
         F32 text_bottom = (F32)background.mBottom + (F32)UI_LINEEDITOR_V_PAD;
@@ -1677,7 +1725,7 @@ void LLLineEditor::draw()
 
 
 // Returns the local screen space X coordinate associated with the text cursor position.
-S32 LLLineEditor::findPixelNearestPos(const S32 cursor_offset)
+S32 LLLineEditor::findPixelNearestPos(const S32 cursor_offset) const
 {
         S32 dpos = getCursor() - mScrollHPos + cursor_offset;
         S32 result = mGLFont->getWidth(mText.getWString().c_str(), mScrollHPos, dpos) + mMinHPixels;
@@ -1715,7 +1763,7 @@ void LLLineEditor::setFocus( BOOL new_state )
 
         if (!new_state)
         {
-                getWindow()->allowLanguageTextInput(FALSE);
+                getWindow()->allowLanguageTextInput(this, FALSE);
         }
 
 
@@ -1757,7 +1805,7 @@ void LLLineEditor::setFocus( BOOL new_state )
                 // fine on 1.15.0.2, since all prevalidate func reject any
                 // non-ASCII characters.  I'm not sure on future versions,
                 // however.
-                getWindow()->allowLanguageTextInput(mPrevalidateFunc == NULL);
+                getWindow()->allowLanguageTextInput(this, mPrevalidateFunc == NULL);
         }
 }
 
@@ -1776,6 +1824,12 @@ void LLLineEditor::setRect(const LLRect& rect)
         }
 }
 
+void LLLineEditor::setPrevalidate(BOOL (*func)(const LLWString &))
+{
+        mPrevalidateFunc = func;
+        updateAllowingLanguageInput();
+}
+
 // Limits what characters can be used to [1234567890.-] with [-] only valid in the first position.
 // Does NOT ensure that the string is a well-formed number--that's the job of post-validation--for
 // the simple reasons that intermediate states may be invalid even if the final result is valid.
@@ -2336,6 +2390,239 @@ BOOL LLLineEditor::setLabelArg( const LLString& key, const LLStringExplicit& tex
         return TRUE;
 }
 
+
+void LLLineEditor::updateAllowingLanguageInput()
+{
+        // Allow Language Text Input only when this LineEditor has
+        // no prevalidate function attached (as long as other criteria
+        // common to LLTextEditor).  This criterion works
+        // fine on 1.15.0.2, since all prevalidate func reject any
+        // non-ASCII characters.  I'm not sure on future versions,
+        // however...
+        if (hasFocus() && !mReadOnly && !mDrawAsterixes && mPrevalidateFunc == NULL)
+        {
+                getWindow()->allowLanguageTextInput(this, TRUE);
+        }
+        else
+        {
+                getWindow()->allowLanguageTextInput(this, FALSE);
+        }
+}
+
+BOOL LLLineEditor::hasPreeditString() const
+{
+        return (mPreeditPositions.size() > 1);
+}
+
+void LLLineEditor::resetPreedit()
+{
+        if (hasPreeditString())
+        {
+                const S32 preedit_pos = mPreeditPositions.front();
+                mText.erase(preedit_pos, mPreeditPositions.back() - preedit_pos);
+                mText.insert(preedit_pos, mPreeditOverwrittenWString);
+                setCursor(preedit_pos);
+                
+                mPreeditWString.clear();
+                mPreeditOverwrittenWString.clear();
+                mPreeditPositions.clear();
+
+                mKeystrokeTimer.reset();
+                if (mKeystrokeCallback)
+                {
+                        mKeystrokeCallback(this, mCallbackUserData);
+                }
+        }
+}
+
+void LLLineEditor::updatePreedit(const LLWString &preedit_string,
+                const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position)
+{
+        // Just in case.
+        if (mReadOnly)
+        {
+                return;
+        }
+
+        if (hasSelection())
+        {
+                if (hasPreeditString())
+                {
+                        llwarns << "Preedit and selection!" << llendl;
+                        deselect();
+                }
+                else
+                {
+                        deleteSelection();
+                }
+        }
+
+        S32 insert_preedit_at = getCursor();
+        if (hasPreeditString())
+        {
+                insert_preedit_at = mPreeditPositions.front();
+                //mText.replace(insert_preedit_at, mPreeditPositions.back() - insert_preedit_at, mPreeditOverwrittenWString);
+                mText.erase(insert_preedit_at, mPreeditPositions.back() - insert_preedit_at);
+                mText.insert(insert_preedit_at, mPreeditOverwrittenWString);
+        }
+
+        mPreeditWString = preedit_string;
+        mPreeditPositions.resize(preedit_segment_lengths.size() + 1);
+        S32 position = insert_preedit_at;
+        for (segment_lengths_t::size_type i = 0; i < preedit_segment_lengths.size(); i++)
+        {
+                mPreeditPositions[i] = position;
+                position += preedit_segment_lengths[i];
+        }
+        mPreeditPositions.back() = position;
+        if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode())
+        {
+                mPreeditOverwrittenWString.assign( LLWString( mText, insert_preedit_at, mPreeditWString.length() ) );
+                mText.erase(insert_preedit_at, mPreeditWString.length());
+        }
+        else
+        {
+                mPreeditOverwrittenWString.clear();
+        }
+        mText.insert(insert_preedit_at, mPreeditWString);
+
+        mPreeditStandouts = preedit_standouts;
+
+        setCursor(position);
+        setCursor(mPreeditPositions.front() + caret_position);
+
+        // Update of the preedit should be caused by some key strokes.
+        mKeystrokeTimer.reset();
+        if( mKeystrokeCallback )
+        {
+                mKeystrokeCallback( this, mCallbackUserData );
+        }
+}
+
+BOOL LLLineEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect *bounds, LLRect *control) const
+{
+        if (control)
+        {
+                LLRect control_rect_screen;
+                localRectToScreen(mRect, &control_rect_screen);
+                LLUI::screenRectToGL(control_rect_screen, control);
+        }
+
+        S32 preedit_left_column, preedit_right_column;
+        if (hasPreeditString())
+        {
+                preedit_left_column = mPreeditPositions.front();
+                preedit_right_column = mPreeditPositions.back();
+        }
+        else
+        {
+                preedit_left_column = preedit_right_column = getCursor();
+        }
+        if (preedit_right_column < mScrollHPos)
+        {
+                // This should not occure...
+                return FALSE;
+        }
+
+        const S32 query = (query_offset >= 0 ? preedit_left_column + query_offset : getCursor());
+        if (query < mScrollHPos || query < preedit_left_column || query > preedit_right_column)
+        {
+                return FALSE;
+        }
+
+        if (coord)
+        {
+                S32 query_local = findPixelNearestPos(query - getCursor());
+                S32 query_screen_x, query_screen_y;
+                localPointToScreen(query_local, mRect.getHeight() / 2, &query_screen_x, &query_screen_y);
+                LLUI::screenPointToGL(query_screen_x, query_screen_y, &coord->mX, &coord->mY);
+        }
+
+        if (bounds)
+        {
+                S32 preedit_left_local = findPixelNearestPos(llmax(preedit_left_column, mScrollHPos) - getCursor());
+                S32 preedit_right_local = llmin(findPixelNearestPos(preedit_right_column - getCursor()), mRect.getWidth() - mBorderThickness);
+                if (preedit_left_local > preedit_right_local)
+                {
+                        // Is this condition possible?
+                        preedit_right_local = preedit_left_local;
+                }
+
+                LLRect preedit_rect_local(preedit_left_local, mRect.getHeight(), preedit_right_local, 0);
+                LLRect preedit_rect_screen;
+                localRectToScreen(preedit_rect_local, &preedit_rect_screen);
+                LLUI::screenRectToGL(preedit_rect_screen, bounds);
+        }
+
+        return TRUE;
+}
+
+void LLLineEditor::getPreeditRange(S32 *position, S32 *length) const
+{
+        if (hasPreeditString())
+        {
+                *position = mPreeditPositions.front();
+                *length = mPreeditPositions.back() - mPreeditPositions.front();
+        }
+        else
+        {
+                *position = mCursorPos;
+                *length = 0;
+        }
+}
+
+void LLLineEditor::getSelectionRange(S32 *position, S32 *length) const
+{
+        if (hasSelection())
+        {
+                *position = llmin(mSelectionStart, mSelectionEnd);
+                *length = llabs(mSelectionStart - mSelectionEnd);
+        }
+        else
+        {
+                *position = mCursorPos;
+                *length = 0;
+        }
+}
+
+void LLLineEditor::markAsPreedit(S32 position, S32 length)
+{
+        deselect();
+        setCursor(position);
+        if (hasPreeditString())
+        {
+                llwarns << "markAsPreedit invoked when hasPreeditString is true." << llendl;
+        }
+        mPreeditWString.assign( LLWString( mText.getWString(), position, length ) );
+        if (length > 0)
+        {
+                mPreeditPositions.resize(2);
+                mPreeditPositions[0] = position;
+                mPreeditPositions[1] = position + length;
+                mPreeditStandouts.resize(1);
+                mPreeditStandouts[0] = FALSE;
+        }
+        else
+        {
+                mPreeditPositions.clear();
+                mPreeditStandouts.clear();
+        }
+        if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode())
+        {
+                mPreeditOverwrittenWString = mPreeditWString;
+        }
+        else
+        {
+                mPreeditOverwrittenWString.clear();
+        }
+}
+
+S32 LLLineEditor::getPreeditFontSize() const
+{
+        return llround(mGLFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]);
+}
+
+
 LLSearchEditor::LLSearchEditor(const LLString& name, 
                 const LLRect& rect,
                 S32 max_length_bytes,
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index d4ebe3c..6d328e5 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -53,6 +53,8 @@
 #include "lluistring.h"
 #include "llviewborder.h"
 
+#include "llpreeditor.h"
+
 class LLFontGL;
 class LLLineEditorRollback;
 class LLButton;
@@ -63,7 +65,7 @@ typedef BOOL (*LLLinePrevalidateFunc)(const LLWString &wstr);
 // Classes
 //
 class LLLineEditor
-: public LLUICtrl, public LLEditMenuHandler
+: public LLUICtrl, public LLEditMenuHandler, protected LLPreeditor
 {
         friend class LLLineEditorRollback;
 
@@ -75,7 +77,7 @@ public:
                                  S32 max_length_bytes = 254,
                                  void (*commit_callback)(LLUICtrl* caller, void* user_data) = NULL,
                                  void (*keystroke_callback)(LLLineEditor* caller, void* user_data) = NULL,
-                                 void (*focus_lost_callback)(LLUICtrl* caller, void* user_data) = NULL,
+                                 void (*focus_lost_callback)(LLFocusableElement* caller, void* user_data) = NULL,
                                  void* userdata = NULL,
                                  LLLinePrevalidateFunc prevalidate_func = NULL,
                                  LLViewBorder::EBevel border_bevel = LLViewBorder::BEVEL_IN,
@@ -120,6 +122,7 @@ public:
         // view overrides
         virtual void    draw();
         virtual void    reshape(S32 width,S32 height,BOOL called_from_parent=TRUE);
+        virtual void    onFocusReceived();
         virtual void    onFocusLost();
         virtual void    setEnabled(BOOL enabled);
 
@@ -146,7 +149,7 @@ public:
         const LLWString& getWText() const       { return mText.getWString(); }
         S32                             getLength() const       { return mText.length(); }
 
-        S32                             getCursor()             { return mCursorPos; }
+        S32                             getCursor()     const   { return mCursorPos; }
         void                    setCursor( S32 pos );
         void                    setCursorToEnd();
 
@@ -177,13 +180,13 @@ public:
         void                    setIgnoreTab(BOOL b)                    { mIgnoreTab = b; }
         void                    setPassDelete(BOOL b)                   { mPassDelete = b; }
 
-        void                    setDrawAsterixes(BOOL b)                { mDrawAsterixes = b; }
+        void                    setDrawAsterixes(BOOL b);
 
         // get the cursor position of the beginning/end of the prev/next word in the text
         S32                             prevWordPos(S32 cursorPos) const;
         S32                             nextWordPos(S32 cursorPos) const;
 
-        BOOL                    hasSelection() { return (mSelectionStart != mSelectionEnd); }
+        BOOL                    hasSelection() const { return (mSelectionStart != mSelectionEnd); }
         void                    startSelection();
         void                    endSelection();
         void                    extendSelection(S32 new_cursor_pos);
@@ -199,7 +202,7 @@ public:
 
         static BOOL             isPartOfWord(llwchar c);
         // Prevalidation controls which keystrokes can affect the editor
-        void                    setPrevalidate( BOOL (*func)(const LLWString &) ) { mPrevalidateFunc = func; }
+        void                    setPrevalidate( BOOL (*func)(const LLWString &) );
         static BOOL             prevalidateFloat(const LLWString &str );
         static BOOL             prevalidateInt(const LLWString &str );
         static BOOL             prevalidatePositiveS32(const LLWString &str);
@@ -221,7 +224,7 @@ protected:
         void                    addChar(const llwchar c);
         void                    setCursorAtLocalPos(S32 local_mouse_x);
 
-        S32                             findPixelNearestPos(S32 cursor_offset = 0);
+        S32                             findPixelNearestPos(S32 cursor_offset = 0) const;
         void                    reportBadKeystroke();
 
         BOOL                    handleSpecialKey(KEY key, MASK mask);
@@ -230,6 +233,19 @@ protected:
         S32                             handleCommitKey(KEY key, MASK mask);
 
 protected:
+        void                    updateAllowingLanguageInput();
+        BOOL                    hasPreeditString() const;
+        // Implementation (overrides) of LLPreeditor
+        virtual void    resetPreedit();
+        virtual void    updatePreedit(const LLWString &preedit_string,
+                                                const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position);
+        virtual void    markAsPreedit(S32 position, S32 length);
+        virtual void    getPreeditRange(S32 *position, S32 *length) const;
+        virtual void    getSelectionRange(S32 *position, S32 *length) const;
+        virtual BOOL    getPreeditLocation(S32 query_position, LLCoordGL *coord, LLRect *bounds, LLRect *control) const;
+        virtual S32             getPreeditFontSize() const;
+
+protected:
         LLUIString              mText;                                  // The string being edited.
         LLString                mPrevText;                              // Saved string for 'ESC' revert
         LLUIString              mLabel;                                 // text label that is visible when no user text provided
@@ -241,8 +257,7 @@ protected:
 
         LLViewBorder* mBorder;
         const LLFontGL* mGLFont;
-        S32                     mMaxLengthChars;                        // Max number of characters
-        S32                     mMaxLengthBytes;                        // Max length of the UTF8 string.
+        S32                     mMaxLengthBytes;                        // Max length of the UTF8 string in bytes
         S32                     mCursorPos;                                     // I-beam is just after the mCursorPos-th character.
         S32                     mScrollHPos;                            // Horizontal offset from the start of mText.  Used for scrolling.
         LLFrameTimer mScrollTimer;
@@ -288,6 +303,11 @@ protected:
         BOOL            mPassDelete;
 
         BOOL            mReadOnly;
+
+        LLWString       mPreeditWString;
+        LLWString       mPreeditOverwrittenWString;
+        std::vector<S32> mPreeditPositions;
+        LLPreeditor::standouts_t mPreeditStandouts;
 };
 
 
diff --git a/linden/indra/llui/llmemberlistener.h b/linden/indra/llui/llmemberlistener.h
index b4ee2f1..02aff17 100644
--- a/linden/indra/llui/llmemberlistener.h
+++ b/linden/indra/llui/llmemberlistener.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 4afa6b9..a56b090 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -632,7 +632,7 @@ public:
 };
 
 LLMenuItemSeparatorGL::LLMenuItemSeparatorGL( const LLString &name ) :
-        LLMenuItemGL( SEPARATOR_NAME, SEPARATOR_LABEL )
+        LLMenuItemGL( name, SEPARATOR_LABEL )
 {
 }
 
@@ -2832,7 +2832,7 @@ LLMenuItemGL* LLMenuGL::highlightNextItem(LLMenuItemGL* cur_item, BOOL skip_disa
         while(1)
         {
                 // skip separators and disabled items
-                if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getName() != SEPARATOR_NAME)
+                if ((*next_item_iter)->getEnabled() && (*next_item_iter)->getType() != SEPARATOR_NAME)
                 {
                         if (cur_item)
                         {
@@ -4514,7 +4514,7 @@ BOOL LLMenuHolderGL::hideMenus()
         }
         //if (gFocusMgr.childHasKeyboardFocus(this))
         //{
-        //      gFocusMgr.setKeyboardFocus(NULL, NULL);
+        //      gFocusMgr.setKeyboardFocus(NULL);
         //}
 
         return menu_visible;
@@ -4599,6 +4599,7 @@ void LLTearOffMenu::onFocusReceived()
                         break;
                 }
         }
+        LLFloater::onFocusReceived();
 }
 
 void LLTearOffMenu::onFocusLost()
diff --git a/linden/indra/llui/llmenugl.h b/linden/indra/llui/llmenugl.h
index 21594f6..9274101 100644
--- a/linden/indra/llui/llmenugl.h
+++ b/linden/indra/llui/llmenugl.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llmodaldialog.cpp b/linden/indra/llui/llmodaldialog.cpp
index 72a7fcb..ff4858f 100644
--- a/linden/indra/llui/llmodaldialog.cpp
+++ b/linden/indra/llui/llmodaldialog.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -70,6 +70,16 @@ LLModalDialog::~LLModalDialog()
         }
 }
 
+// virtual
+void LLModalDialog::open()      /* Flawfinder: ignore */
+{
+        // SJB: Hack! Make sure we don't ever host a modal dialog
+        LLMultiFloater* thost = LLFloater::sHostp;
+        LLFloater::sHostp = NULL;
+        LLFloater::open();
+        LLFloater::sHostp = thost;
+}
+
 void LLModalDialog::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
         LLFloater::reshape(width, height, called_from_parent);
@@ -287,7 +297,7 @@ void LLModalDialog::onAppFocusLost()
 
                 if( gFocusMgr.childHasKeyboardFocus( instance ) )
                 {
-                        gFocusMgr.setKeyboardFocus( NULL, NULL );
+                        gFocusMgr.setKeyboardFocus( NULL );
                 }
         }
 }
diff --git a/linden/indra/llui/llmodaldialog.h b/linden/indra/llui/llmodaldialog.h
index 1529ac3..342a0f6 100644
--- a/linden/indra/llui/llmodaldialog.h
+++ b/linden/indra/llui/llmodaldialog.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -47,6 +47,8 @@ public:
         LLModalDialog( const LLString& title, S32 width, S32 height, BOOL modal = true );
         /*virtual*/ ~LLModalDialog();
 
+        /*virtual*/ void        open(); /* Flawfinder: ignore */
+        
         /*virtual*/ void        reshape(S32 width, S32 height, BOOL called_from_parent = 1);
         
         /*virtual*/ void        startModal();
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 2c37dfd..af8aa21 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -64,7 +64,6 @@ LLPanel::panel_map_t LLPanel::sPanelMap;
 LLPanel::alert_queue_t LLPanel::sAlertQueue;
 
 const S32 RESIZE_BAR_OVERLAP = 1;
-const S32 PANEL_STACK_GAP = RESIZE_BAR_HEIGHT;
 
 void LLPanel::init()
 {
@@ -88,6 +87,7 @@ LLPanel::LLPanel()
 : mRectControl()
 {
         init();
+        setName("panel");
 }
 
 LLPanel::LLPanel(const LLString& name)
@@ -124,6 +124,7 @@ LLPanel::LLPanel(const LLString& name, const LLString& rect_control, BOOL border
 void LLPanel::addBorder(LLViewBorder::EBevel border_bevel,
                                                 LLViewBorder::EStyle border_style, S32 border_thickness)
 {
+        removeBorder();
         mBorder = new LLViewBorder( "panel border", 
                                                                 LLRect(0, mRect.getHeight(), mRect.getWidth(), 0), 
                                                                 border_bevel, border_style, border_thickness );
@@ -339,11 +340,6 @@ void LLPanel::addCtrl( LLUICtrl* ctrl, S32 tab_group)
         mLastTabGroup = tab_group;
 
         LLView::addCtrl(ctrl, tab_group);
-        // propagate chrome to children only if they have not been flagged as chrome
-        if (!ctrl->getIsChrome())
-        {
-                ctrl->setIsChrome(getIsChrome());
-        }
 }
 
 void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group)
@@ -351,22 +347,12 @@ void LLPanel::addCtrlAtEnd( LLUICtrl* ctrl, S32 tab_group)
         mLastTabGroup = tab_group;
 
         LLView::addCtrlAtEnd(ctrl, tab_group);
-        if (!ctrl->getIsChrome())
-        {
-                ctrl->setIsChrome(getIsChrome());
-        }
 }
 
 BOOL LLPanel::handleKeyHere( KEY key, MASK mask, BOOL called_from_parent )
 {
         BOOL handled = FALSE;
 
-        if( getVisible() && getEnabled() && gFocusMgr.childHasKeyboardFocus(this) && KEY_ESCAPE == key )
-        {
-                gFocusMgr.setKeyboardFocus(NULL, NULL);
-                return TRUE;
-        }
-
         if( getVisible() && getEnabled() && 
                 gFocusMgr.childHasKeyboardFocus(this) && !called_from_parent )
         {
@@ -472,7 +458,7 @@ void LLPanel::setFocus(BOOL b)
         {
                 if( this == gFocusMgr.getKeyboardFocus() )
                 {
-                        gFocusMgr.setKeyboardFocus( NULL, NULL );
+                        gFocusMgr.setKeyboardFocus( NULL );
                 }
                 else
                 {
@@ -595,7 +581,8 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *fac
         {
                 LLRect rect;
                 createRect(node, rect, parent, LLRect());
-                panelp = new LLPanel(name, rect);
+                // create a new panel without a border, by default
+                panelp = new LLPanel(name, rect, FALSE);
                 panelp->initPanelXML(node, parent, factory);
                 // preserve panel's width and height, but override the location
                 const LLRect& panelrect = panelp->getRect();
@@ -608,12 +595,13 @@ LLView* LLPanel::fromXML(LLXMLNodePtr node, LLView* parent, LLUICtrlFactory *fac
         {
                 panelp->initPanelXML(node, parent, factory);
         }
+
         return panelp;
 }
 
 BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-        LLString name("panel");
+        LLString name = getName();
         node->getAttributeString("name", name);
         setName(name);
 
@@ -628,13 +616,15 @@ BOOL LLPanel::initPanelXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
 
         if (!xml_filename.empty())
         {
-                // Preserve postion of embedded panel but allow panel to dictate width/height
-                LLRect rect(getRect());
                 didPost = factory->buildPanel(this, xml_filename, NULL);
-                S32 w = getRect().getWidth();
-                S32 h = getRect().getHeight();
-                rect.setLeftTopAndSize(rect.mLeft, rect.mTop, w, h);
-                setRect(rect);
+
+                LLRect new_rect = getRect();
+                // override rectangle with embedding parameters as provided
+                createRect(node, new_rect, parent);
+                setOrigin(new_rect.mLeft, new_rect.mBottom);
+                reshape(new_rect.getWidth(), new_rect.getHeight());
+                // optionally override follows flags from including nodes
+                parseFollowsFlags(node);
         }
         else
         {
@@ -678,7 +668,7 @@ void LLPanel::setPanelParameters(LLXMLNodePtr node, LLView* parent)
         initFromXML(node, parent);
 
         /////// Border attributes ///////
-        BOOL border = FALSE;
+        BOOL border = mBorder != NULL;
         node->getAttributeBOOL("border", border);
         if (border)
         {
@@ -706,24 +696,24 @@ void LLPanel::setPanelParameters(LLXMLNodePtr node, LLView* parent)
         }
 
         /////// Background attributes ///////
-        BOOL background_visible = FALSE;
+        BOOL background_visible = mBgVisible;
         node->getAttributeBOOL("background_visible", background_visible);
         setBackgroundVisible(background_visible);
         
-        BOOL background_opaque = FALSE;
+        BOOL background_opaque = mBgOpaque;
         node->getAttributeBOOL("background_opaque", background_opaque);
         setBackgroundOpaque(background_opaque);
 
         LLColor4 color;
-        color = LLUI::sColorsGroup->getColor( "FocusBackgroundColor" );
+        color = mBgColorOpaque;
         LLUICtrlFactory::getAttributeColor(node,"bg_opaque_color", color);
         setBackgroundColor(color);
 
-        color = LLUI::sColorsGroup->getColor( "DefaultBackgroundColor" );
+        color = mBgColorAlpha;
         LLUICtrlFactory::getAttributeColor(node,"bg_alpha_color", color);
         setTransparentColor(color);
 
-        LLString label;
+        LLString label = getLabel();
         node->getAttributeString("label", label);
         setLabel(label);
 }
@@ -853,12 +843,12 @@ BOOL LLPanel::childHasFocus(const LLString& id)
 }
 
 
-void LLPanel::childSetFocusChangedCallback(const LLString& id, void (*cb)(LLUICtrl*, void*))
+void LLPanel::childSetFocusChangedCallback(const LLString& id, void (*cb)(LLFocusableElement*, void*), void* user_data)
 {
         LLUICtrl* child = (LLUICtrl*)getChildByName(id, true);
         if (child)
         {
-                child->setFocusChangedCallback(cb);
+                child->setFocusChangedCallback(cb, user_data);
         }
 }
 
@@ -1165,11 +1155,12 @@ void LLPanel::storeRectControl()
 //
 struct LLLayoutStack::LLEmbeddedPanel
 {
-        LLEmbeddedPanel(LLPanel* panelp, eLayoutOrientation orientation, S32 min_width, S32 min_height, BOOL auto_resize) : 
+        LLEmbeddedPanel(LLPanel* panelp, eLayoutOrientation orientation, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize) : 
                         mPanel(panelp), 
                         mMinWidth(min_width), 
                         mMinHeight(min_height),
                         mAutoResize(auto_resize),
+                        mUserResize(user_resize),
                         mOrientation(orientation),
                         mVisibleAmt(1.f) // default to fully visible
         {
@@ -1194,10 +1185,18 @@ struct LLLayoutStack::LLEmbeddedPanel
                 }
         }
 
+        ~LLEmbeddedPanel()
+        {
+                // probably not necessary, but...
+                delete mResizeBar;
+                mResizeBar = NULL;
+        }
+
         LLPanel* mPanel;
         S32 mMinWidth;
         S32 mMinHeight;
         BOOL mAutoResize;
+        BOOL mUserResize;
         LLResizeBar* mResizeBar;
         eLayoutOrientation mOrientation;
         F32 mVisibleAmt;
@@ -1206,36 +1205,40 @@ struct LLLayoutStack::LLEmbeddedPanel
 LLLayoutStack::LLLayoutStack(eLayoutOrientation orientation) : 
                 mOrientation(orientation),
                 mMinWidth(0),
-                mMinHeight(0)
+                mMinHeight(0),
+                mPanelSpacing(RESIZE_BAR_HEIGHT)
 {
 }
 
 LLLayoutStack::~LLLayoutStack()
 {
+        std::for_each(mPanels.begin(), mPanels.end(), DeletePointer());
 }
 
 void LLLayoutStack::draw()
 {
         updateLayout();
         {
-                // clip if outside nominal bounds
-                LLLocalClipRect clip(getLocalRect(), mRect.getWidth() > mMinWidth || mRect.getHeight() > mMinHeight);
                 e_panel_list_t::iterator panel_it;
                 for (panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
                 {
+                        // clip to layout rectangle, not bounding rectangle
                         LLRect clip_rect = (*panel_it)->mPanel->getRect();
                         // scale clipping rectangle by visible amount
                         if (mOrientation == HORIZONTAL)
                         {
-                                clip_rect.mRight = clip_rect.mLeft + llround(clip_rect.getWidth() * (*panel_it)->mVisibleAmt);
+                                clip_rect.mRight = clip_rect.mLeft + llround((F32)clip_rect.getWidth() * (*panel_it)->mVisibleAmt);
                         }
                         else
                         {
-                                clip_rect.mBottom = clip_rect.mTop - llround(clip_rect.getHeight() * (*panel_it)->mVisibleAmt);
+                                clip_rect.mBottom = clip_rect.mTop - llround((F32)clip_rect.getHeight() * (*panel_it)->mVisibleAmt);
                         }
-                        LLLocalClipRect clip(clip_rect, (*panel_it)->mVisibleAmt < 1.f);
+
+                        LLPanel* panelp = (*panel_it)->mPanel;
+
+                        LLLocalClipRect clip(clip_rect);
                         // only force drawing invisible children if visible amount is non-zero
-                        drawChild((*panel_it)->mPanel, 0, 0, (*panel_it)->mVisibleAmt > 0.f);
+                        drawChild(panelp, 0, 0, !clip_rect.isNull());
                 }
         }
 }
@@ -1250,17 +1253,13 @@ void LLLayoutStack::removeCtrl(LLUICtrl* ctrl)
                 delete embedded_panelp;
         }
 
+        // need to update resizebars
+
         calcMinExtents();
 
         LLView::removeCtrl(ctrl);
 }
 
-void LLLayoutStack::reshape(S32 width, S32 height, BOOL called_from_parent)
-{
-        LLView::reshape(width, height, called_from_parent);
-        //updateLayout();
-}
-
 LLXMLNodePtr LLLayoutStack::getXML(bool save_children) const
 {
         LLXMLNodePtr node = LLView::getXML();
@@ -1290,6 +1289,14 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
 
         LLLayoutStack* layout_stackp = new LLLayoutStack(orientation);
 
+        node->getAttributeS32("border_size", layout_stackp->mPanelSpacing);
+        // don't allow negative spacing values
+        layout_stackp->mPanelSpacing = llmax(layout_stackp->mPanelSpacing, 0);
+
+        LLString name("stack");
+        node->getAttributeString("name", name);
+
+        layout_stackp->setName(name);
         layout_stackp->initFromXML(node, parent);
 
         LLXMLNodePtr child;
@@ -1300,16 +1307,18 @@ LLView* LLLayoutStack::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactor
                         S32 min_width = 0;
                         S32 min_height = 0;
                         BOOL auto_resize = TRUE;
+                        BOOL user_resize = TRUE;
 
                         child->getAttributeS32("min_width", min_width);
                         child->getAttributeS32("min_height", min_height);
                         child->getAttributeBOOL("auto_resize", auto_resize);
+                        child->getAttributeBOOL("user_resize", user_resize);
 
                         LLPanel* panelp = (LLPanel*)LLPanel::fromXML(child, layout_stackp, factory);
                         if (panelp)
                         {
                                 panelp->setFollowsNone();
-                                layout_stackp->addPanel(panelp, min_width, min_height, auto_resize);
+                                layout_stackp->addPanel(panelp, min_width, min_height, auto_resize, user_resize);
                         }
                 }
         }
@@ -1327,11 +1336,36 @@ S32 LLLayoutStack::getMinHeight()
         return mMinHeight;
 }
 
-void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, S32 index)
+S32 LLLayoutStack::getDefaultHeight(S32 cur_height)
+{
+        // if we are spanning our children (crude upward propagation of size)
+        // then don't enforce our size on our children
+        if (mOrientation == HORIZONTAL)
+        {
+                cur_height = llmax(mMinHeight, mRect.getHeight());
+        }
+
+        return cur_height;
+}
+
+S32 LLLayoutStack::getDefaultWidth(S32 cur_width)
 {
-        LLEmbeddedPanel* embedded_panel = new LLEmbeddedPanel(panel, mOrientation, min_width, min_height, auto_resize);
+        // if we are spanning our children (crude upward propagation of size)
+        // then don't enforce our size on our children
+        if (mOrientation == VERTICAL)
+        {
+                cur_width = llmax(mMinWidth, mRect.getWidth());
+        }
+
+        return cur_width;
+}
+
+void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, S32 index)
+{
+        LLEmbeddedPanel* embedded_panel = new LLEmbeddedPanel(panel, mOrientation, min_width, min_height, auto_resize, user_resize);
         
         mPanels.insert(mPanels.begin() + llclamp(index, 0, (S32)mPanels.size()), embedded_panel);
+        
         addChild(panel);
         addChild(embedded_panel->mResizeBar);
 
@@ -1339,29 +1373,15 @@ void LLLayoutStack::addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL
         // with a bit of overlap
         for (e_panel_list_t::iterator panel_it = mPanels.begin(); panel_it != mPanels.end(); ++panel_it)
         {
-                e_panel_list_t::iterator next_it = panel_it;
-                ++next_it;
-
                 LLResizeBar* resize_barp = (*panel_it)->mResizeBar;
                 sendChildToFront(resize_barp);
-                // last resize bar is disabled, since its not between any two panels
-                if ( next_it == mPanels.end() )
-                {
-                        resize_barp->setEnabled(FALSE);
-                }
-                else
-                {
-                        resize_barp->setEnabled(TRUE);
-                }
         }
 
-        //updateLayout();
 }
 
 void LLLayoutStack::removePanel(LLPanel* panel)
 {
         removeChild(panel);
-        //updateLayout();
 }
 
 void LLLayoutStack::updateLayout(BOOL force_resize)
@@ -1369,11 +1389,11 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
         calcMinExtents();
 
         // calculate current extents
-        S32 cur_width = 0;
-        S32 cur_height = 0;
+        S32 total_width = 0;
+        S32 total_height = 0;
 
         const F32 ANIM_OPEN_TIME = 0.02f;
-        const F32 ANIM_CLOSE_TIME = 0.02f;
+        const F32 ANIM_CLOSE_TIME = 0.03f;
 
         e_panel_list_t::iterator panel_it;
         for (panel_it = mPanels.begin(); panel_it != mPanels.end();     ++panel_it)
@@ -1395,23 +1415,22 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                 (*panel_it)->mVisibleAmt = 0.f;
                         }
                 }
+
                 if (mOrientation == HORIZONTAL)
                 {
-                        // all panels get expanded to max of all the minimum dimensions
-                        cur_height = llmax(mMinHeight, panelp->getRect().getHeight());
-                cur_width += llround(panelp->getRect().getWidth() * (*panel_it)->mVisibleAmt);
-                        if (panel_it != mPanels.end())
+                total_width += llround(panelp->getRect().getWidth() * (*panel_it)->mVisibleAmt);
+                // want n-1 panel gaps for n panels
+                        if (panel_it != mPanels.begin())
                         {
-                                cur_width += PANEL_STACK_GAP;
+                                total_width += mPanelSpacing;
                         }
                 }
                 else //VERTICAL
                 {
-            cur_width = llmax(mMinWidth, panelp->getRect().getWidth());
-                        cur_height += llround(panelp->getRect().getHeight() * (*panel_it)->mVisibleAmt);
-                        if (panel_it != mPanels.end())
+                        total_height += llround(panelp->getRect().getHeight() * (*panel_it)->mVisibleAmt);
+                        if (panel_it != mPanels.begin())
                         {
-                                cur_height += PANEL_STACK_GAP;
+                                total_height += mPanelSpacing;
                         }
                 }
         }
@@ -1457,11 +1476,11 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
         S32 pixels_to_distribute;
         if (mOrientation == HORIZONTAL)
         {
-                pixels_to_distribute = mRect.getWidth() - cur_width;
+                pixels_to_distribute = mRect.getWidth() - total_width;
         }
         else //VERTICAL
         {
-                pixels_to_distribute = mRect.getHeight() - cur_height;
+                pixels_to_distribute = mRect.getHeight() - total_height;
         }
 
         S32 cur_x = 0;
@@ -1474,7 +1493,7 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                 S32 cur_width = panelp->getRect().getWidth();
                 S32 cur_height = panelp->getRect().getHeight();
                 S32 new_width = llmax((*panel_it)->mMinWidth, cur_width);
-                S32 new_height = llmax((*panel_it)->mMinHeight, cur_height);
+                S32 new_height = llmax((*panel_it)->mMinHeight, cur_height); 
 
                 S32 delta_size = 0;
 
@@ -1494,11 +1513,11 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                         // grow all elements equally
                                         delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
                                 }
-                                new_width = llmax((*panel_it)->mMinWidth, panelp->getRect().getWidth() + delta_size);
+                                new_width = llmax((*panel_it)->mMinWidth, cur_width + delta_size);
                         }
                         else
                         {
-                                new_width = llmax(mMinWidth, mRect.getWidth());
+                                new_width = getDefaultWidth(new_width);
                         }
 
                         if (mOrientation == VERTICAL)
@@ -1512,22 +1531,22 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                                 {
                                         delta_size = llround((F32)pixels_to_distribute / (F32)num_resizable_panels);
                                 }
-                                new_height = llmax((*panel_it)->mMinHeight, panelp->getRect().getHeight() + delta_size);
+                                new_height = llmax((*panel_it)->mMinHeight, cur_height + delta_size);
                         }
                         else
                         {
-                                new_height = llmax(mMinHeight, mRect.getHeight());
+                                new_height = getDefaultHeight(new_height);
                         }
                 }
-                else // don't resize
+                else
                 {
                         if (mOrientation == HORIZONTAL)
                         {
-                                new_height = llmax(mMinHeight, mRect.getHeight());
+                                new_height = getDefaultHeight(new_height);
                         }
                         else // VERTICAL
                         {
-                                new_width = llmax(mMinWidth, mRect.getWidth());
+                                new_width = getDefaultWidth(new_width);
                         }
                 }
 
@@ -1542,22 +1561,22 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
                 if (mOrientation == HORIZONTAL)
                 {
                         resize_bar_rect.mLeft = panel_rect.mRight - RESIZE_BAR_OVERLAP;
-                        resize_bar_rect.mRight = panel_rect.mRight + PANEL_STACK_GAP + RESIZE_BAR_OVERLAP;
+                        resize_bar_rect.mRight = panel_rect.mRight + mPanelSpacing + RESIZE_BAR_OVERLAP;
                 }
                 else
                 {
                         resize_bar_rect.mTop = panel_rect.mBottom + RESIZE_BAR_OVERLAP;
-                        resize_bar_rect.mBottom = panel_rect.mBottom - PANEL_STACK_GAP - RESIZE_BAR_OVERLAP;
+                        resize_bar_rect.mBottom = panel_rect.mBottom - mPanelSpacing - RESIZE_BAR_OVERLAP;
                 }
                 (*panel_it)->mResizeBar->setRect(resize_bar_rect);
 
                 if (mOrientation == HORIZONTAL)
                 {
-                        cur_x += llround(new_width * (*panel_it)->mVisibleAmt) + PANEL_STACK_GAP;
+                        cur_x += llround(new_width * (*panel_it)->mVisibleAmt) + mPanelSpacing;
                 }
                 else //VERTICAL
                 {
-                        cur_y -= llround(new_height * (*panel_it)->mVisibleAmt) + PANEL_STACK_GAP;
+                        cur_y -= llround(new_height * (*panel_it)->mVisibleAmt) + mPanelSpacing;
                 }
         }
 
@@ -1569,29 +1588,38 @@ void LLLayoutStack::updateLayout(BOOL force_resize)
 
                 if (mOrientation == HORIZONTAL)
                 {
-                        (*panel_it)->mResizeBar->setResizeLimits((*panel_it)->mMinWidth, (*panel_it)->mMinWidth + shrink_headroom_total);
+                        (*panel_it)->mResizeBar->setResizeLimits(
+                                (*panel_it)->mMinWidth, 
+                                (*panel_it)->mMinWidth + shrink_headroom_total);
                 }
                 else //VERTICAL
                 {
-                        (*panel_it)->mResizeBar->setResizeLimits((*panel_it)->mMinHeight, (*panel_it)->mMinHeight + shrink_headroom_total);
+                        (*panel_it)->mResizeBar->setResizeLimits(
+                                (*panel_it)->mMinHeight, 
+                                (*panel_it)->mMinHeight + shrink_headroom_total);
                 }
-                // hide resize bars for invisible panels
-                (*panel_it)->mResizeBar->setVisible(panelp->getVisible());
-                if (panelp->getVisible())
+
+                // toggle resize bars based on panel visibility, resizability, etc
+                BOOL resize_bar_enabled = panelp->getVisible() && (*panel_it)->mUserResize;
+                (*panel_it)->mResizeBar->setVisible(resize_bar_enabled);
+
+                if (resize_bar_enabled)
                 {
                         last_resize_bar = (*panel_it)->mResizeBar;
                 }
         }
 
         // hide last resize bar as there is nothing past it
+        // resize bars need to be in between two resizable panels
         if (last_resize_bar)
         {
                 last_resize_bar->setVisible(FALSE);
         }
 
         // not enough room to fit existing contents
-        if (!force_resize && 
-                ((cur_y != -PANEL_STACK_GAP) || (cur_x != mRect.getWidth() + PANEL_STACK_GAP)))
+        if (!force_resize 
+                && ((cur_y != -mPanelSpacing) 
+                        || (cur_x != mRect.getWidth() + mPanelSpacing)))
         {
                 // do another layout pass with all stacked elements contributing
                 // even those that don't usually resize
@@ -1623,20 +1651,22 @@ void LLLayoutStack::calcMinExtents()
         {
                 if (mOrientation == HORIZONTAL)
                 {
-                        mMinHeight = llmax(mMinHeight, (*panel_it)->mMinHeight);
+                        mMinHeight = llmax(     mMinHeight, 
+                                                                (*panel_it)->mMinHeight);
             mMinWidth += (*panel_it)->mMinWidth;
                         if (panel_it != mPanels.begin())
                         {
-                                mMinWidth += PANEL_STACK_GAP;
+                                mMinWidth += mPanelSpacing;
                         }
                 }
                 else //VERTICAL
                 {
-            mMinWidth = llmax(mMinWidth, (*panel_it)->mMinWidth);
+                mMinWidth = llmax(      mMinWidth, 
+                                                                (*panel_it)->mMinWidth);
                         mMinHeight += (*panel_it)->mMinHeight;
                         if (panel_it != mPanels.begin())
                         {
-                                mMinHeight += PANEL_STACK_GAP;
+                                mMinHeight += mPanelSpacing;
                         }
                 }
         }
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index d706fc8..bcbda2c 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -13,12 +13,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -173,7 +173,7 @@ public:
         // LLUICtrl
         void childSetFocus(const LLString& id, BOOL focus = TRUE);
         BOOL childHasFocus(const LLString& id);
-        void childSetFocusChangedCallback(const LLString& id, void (*cb)(LLUICtrl*, void*));
+        void childSetFocusChangedCallback(const LLString& id, void (*cb)(LLFocusableElement*, void*), void* user_data = NULL);
         
         void childSetCommitCallback(const LLString& id, void (*cb)(LLUICtrl*, void*), void* userdata = NULL );
         void childSetDoubleClickCallback(const LLString& id, void (*cb)(void*), void* userdata = NULL );
@@ -277,9 +277,9 @@ public:
         virtual ~LLLayoutStack();
 
         /*virtual*/ void draw();
-        /*virtual*/ void reshape(S32 width, S32 height, BOOL called_from_parent);
         /*virtual*/ LLXMLNodePtr getXML(bool save_children = true) const;
         /*virtual*/ void removeCtrl(LLUICtrl* ctrl);
+
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_LAYOUT_STACK; }
         virtual LLString getWidgetTag() const { return LL_LAYOUT_STACK_TAG; }
 
@@ -288,7 +288,7 @@ public:
         S32 getMinWidth();
         S32 getMinHeight();
         
-        void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, S32 index = S32_MAX);
+        void addPanel(LLPanel* panel, S32 min_width, S32 min_height, BOOL auto_resize, BOOL user_resize, S32 index = S32_MAX);
         void removePanel(LLPanel* panel);
         void updateLayout(BOOL force_resize = FALSE);
 
@@ -299,6 +299,8 @@ protected:
         void calcMinExtents();
         S32 getMinStackSize();
         S32 getCurStackSize();
+        S32 getDefaultHeight(S32 cur_height);
+        S32 getDefaultWidth(S32 cur_width);
 
 protected:
         eLayoutOrientation mOrientation;
@@ -308,6 +310,7 @@ protected:
 
         S32 mMinWidth;
         S32 mMinHeight;
+        S32 mPanelSpacing;
 };
 
 #endif
diff --git a/linden/indra/llui/llradiogroup.cpp b/linden/indra/llui/llradiogroup.cpp
index cfb11cd..dad1941 100644
--- a/linden/indra/llui/llradiogroup.cpp
+++ b/linden/indra/llui/llradiogroup.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -473,7 +473,7 @@ BOOL	LLRadioGroup::setSelectedByValue(LLSD value, BOOL selected)
         return FALSE;
 }
 
-LLSD    LLRadioGroup::getSimpleSelectedValue()
+LLSD    LLRadioGroup::getSelectedValue()
 {
         return getValue();      
 }
diff --git a/linden/indra/llui/llradiogroup.h b/linden/indra/llui/llradiogroup.h
index 1eb6bb7..e0a4168 100644
--- a/linden/indra/llui/llradiogroup.h
+++ b/linden/indra/llui/llradiogroup.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -122,7 +122,7 @@ public:
         /*virtual*/ BOOL        setCurrentByID( const LLUUID& id );
         /*virtual*/ LLUUID      getCurrentID();                         // LLUUID::null if no items in menu
         /*virtual*/ BOOL        setSelectedByValue(LLSD value, BOOL selected);
-        /*virtual*/ LLSD        getSimpleSelectedValue();
+        /*virtual*/ LLSD        getSelectedValue();
         /*virtual*/ BOOL        isSelected(LLSD value);
         /*virtual*/ BOOL        operateOnSelection(EOperation op);
         /*virtual*/ BOOL        operateOnAll(EOperation op);
diff --git a/linden/indra/llui/llresizebar.cpp b/linden/indra/llui/llresizebar.cpp
index 8ac165c..e6ce03b 100644
--- a/linden/indra/llui/llresizebar.cpp
+++ b/linden/indra/llui/llresizebar.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresizebar.h b/linden/indra/llui/llresizebar.h
index b9ad124..11fca9d 100644
--- a/linden/indra/llui/llresizebar.h
+++ b/linden/indra/llui/llresizebar.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresizehandle.cpp b/linden/indra/llui/llresizehandle.cpp
index 36eb3b1..739d583 100644
--- a/linden/indra/llui/llresizehandle.cpp
+++ b/linden/indra/llui/llresizehandle.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -60,7 +60,7 @@ LLResizeHandle::LLResizeHandle( const LLString& name, const LLRect& rect, S32 mi
         if( RIGHT_BOTTOM == mCorner)
         {
                 LLUUID image_id(LLUI::sConfigGroup->getString("UIImgResizeBottomRightUUID"));
-                mImage = LLUI::sImageProvider->getUIImageByID(image_id);
+                mImage = LLUI::sImageProvider->getImageByID(image_id);
         }
 
         switch( mCorner )
diff --git a/linden/indra/llui/llresizehandle.h b/linden/indra/llui/llresizehandle.h
index 90c96d7..863ce70 100644
--- a/linden/indra/llui/llresizehandle.h
+++ b/linden/indra/llui/llresizehandle.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 1922f3f..83ad440 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llresmgr.h b/linden/indra/llui/llresmgr.h
index 9f29282..b851795 100644
--- a/linden/indra/llui/llresmgr.h
+++ b/linden/indra/llui/llresmgr.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llrootview.cpp b/linden/indra/llui/llrootview.cpp
index 57fe3ee..1580f99 100644
--- a/linden/indra/llui/llrootview.cpp
+++ b/linden/indra/llui/llrootview.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llrootview.h b/linden/indra/llui/llrootview.h
index 0b6fea3..13037f0 100644
--- a/linden/indra/llui/llrootview.h
+++ b/linden/indra/llui/llrootview.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 34acf03..ec46551 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -159,30 +159,50 @@ void LLScrollbar::setDocParams( S32 size, S32 pos )
 
 void LLScrollbar::setDocPos(S32 pos)
 {
-        mDocPos = llclamp( pos, 0, getDocPosMax() );
-        mDocChanged = TRUE;
+        if (pos != mDocPos)
+        {
+                mDocPos = llclamp( pos, 0, getDocPosMax() );
+                mDocChanged = TRUE;
 
-        updateThumbRect();
+                updateThumbRect();
+        }
 }
 
 void LLScrollbar::setDocSize(S32 size)
 {
-        mDocSize = size;
-        mDocPos = llclamp( mDocPos, 0, getDocPosMax() );
-        mDocChanged = TRUE;
+        if (size != mDocSize)
+        {
+                mDocSize = size;
+                mDocPos = llclamp( mDocPos, 0, getDocPosMax() );
+                mDocChanged = TRUE;
 
-        updateThumbRect();
+                updateThumbRect();
+        }
 }
 
 void LLScrollbar::setPageSize( S32 page_size )
 {
-        mPageSize = page_size;
-        mDocPos = llclamp( mDocPos, 0, getDocPosMax() );
-        mDocChanged = TRUE;
+        if (page_size != mPageSize)
+        {
+                mPageSize = page_size;
+                mDocPos = llclamp( mDocPos, 0, getDocPosMax() );
+                mDocChanged = TRUE;
 
-        updateThumbRect();
+                updateThumbRect();
+        }
+}
+
+BOOL LLScrollbar::isAtBeginning()
+{
+        return mDocPos == 0;
+}
+
+BOOL LLScrollbar::isAtEnd()
+{
+        return mDocPos == getDocPosMax();
 }
 
+
 void LLScrollbar::updateThumbRect()
 {
 //      llassert( 0 <= mDocSize );
@@ -479,7 +499,7 @@ void LLScrollbar::draw()
                 // Draw background and thumb.
                 LLUUID rounded_rect_image_id;
                 rounded_rect_image_id.set(LLUI::sAssetsGroup->getString("rounded_square.tga"));
-                LLImageGL* rounded_rect_imagep = LLUI::sImageProvider->getUIImageByID(rounded_rect_image_id);
+                LLImageGL* rounded_rect_imagep = LLUI::sImageProvider->getImageByID(rounded_rect_image_id);
 
                 if (!rounded_rect_imagep)
                 {
diff --git a/linden/indra/llui/llscrollbar.h b/linden/indra/llui/llscrollbar.h
index 1bfd0f6..464c9c1 100644
--- a/linden/indra/llui/llscrollbar.h
+++ b/linden/indra/llui/llscrollbar.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -88,6 +88,9 @@ public:
         void                            setDocPos( S32 pos );
         S32                                     getDocPos()                             { return mDocPos; }
 
+        BOOL                            isAtBeginning();
+        BOOL                            isAtEnd();
+
         // How many "lines" of the "document" is can appear on a page.
         void                            setPageSize( S32 page_size );
         S32                                     getPageSize()                   { return mPageSize; }
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index 414a2d7..8c8b40c 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -394,33 +394,29 @@ BOOL LLScrollableContainerView::handleDragAndDrop(S32 x, S32 y, MASK mask,
 
 BOOL LLScrollableContainerView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect)
 {
-        if( getVisible() && pointInView(x,y) )
+        S32 local_x, local_y;
+        for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
         {
-                S32 local_x, local_y;
-                for( S32 i = 0; i < SCROLLBAR_COUNT; i++ )
+                local_x = x - mScrollbar[i]->getRect().mLeft;
+                local_y = y - mScrollbar[i]->getRect().mBottom;
+                if( mScrollbar[i]->handleToolTip(local_x, local_y, msg, sticky_rect) )
                 {
-                        local_x = x - mScrollbar[i]->getRect().mLeft;
-                        local_y = y - mScrollbar[i]->getRect().mBottom;
-                        if( mScrollbar[i]->handleToolTip(local_x, local_y, msg, sticky_rect) )
-                        {
-                                return TRUE;
-                        }
+                        return TRUE;
                 }
-                // Handle 'child' view.
-                if( mScrolledView )
+        }
+        // Handle 'child' view.
+        if( mScrolledView )
+        {
+                local_x = x - mScrolledView->getRect().mLeft;
+                local_y = y - mScrolledView->getRect().mBottom;
+                if( mScrolledView->handleToolTip(local_x, local_y, msg, sticky_rect) )
                 {
-                        local_x = x - mScrolledView->getRect().mLeft;
-                        local_y = y - mScrolledView->getRect().mBottom;
-                        if( mScrolledView->handleToolTip(local_x, local_y, msg, sticky_rect) )
-                        {
-                                return TRUE;
-                        }
+                        return TRUE;
                 }
-
-                // Opaque
-                return TRUE;
         }
-        return FALSE;
+
+        // Opaque
+        return TRUE;
 }
 
 void LLScrollableContainerView::calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar )
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 682cade..fb7198c 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollingpanellist.cpp b/linden/indra/llui/llscrollingpanellist.cpp
index 5f91644..a9d538e 100644
--- a/linden/indra/llui/llscrollingpanellist.cpp
+++ b/linden/indra/llui/llscrollingpanellist.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrollingpanellist.h b/linden/indra/llui/llscrollingpanellist.h
index 77002d0..84dc7f9 100644
--- a/linden/indra/llui/llscrollingpanellist.h
+++ b/linden/indra/llui/llscrollingpanellist.h
@@ -11,12 +11,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index b80787f..d65ebd2 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -61,73 +61,101 @@ const S32 LIST_SNAP_PADDING = 5;
 // local structures & classes.
 struct SortScrollListItem
 {
-        SortScrollListItem(const S32 sort_col, BOOL sort_ascending)
-        {
-                mSortCol = sort_col;
-                mSortAscending = sort_ascending;
-        }
+        SortScrollListItem(const std::vector<std::pair<S32, BOOL> >& sort_orders)
+        :       mSortOrders(sort_orders)
+        {}
 
         bool operator()(const LLScrollListItem* i1, const LLScrollListItem* i2)
         {
-                const LLScrollListCell *cell1;
-                const LLScrollListCell *cell2;
-                
-                cell1 = i1->getColumn(mSortCol);
-                cell2 = i2->getColumn(mSortCol);
+                if ( mSortOrders.empty() ) return true;
+
+                const LLScrollListCell *cell1 = NULL;
+                const LLScrollListCell *cell2 = NULL;
                 
-                S32 order = 1;
-                if (!mSortAscending)
+                sort_order_t::const_reverse_iterator end_it = mSortOrders.rend();
+                sort_order_t::const_reverse_iterator it;
+
+                // sort over all columns in order specified by mSortOrders
+                S32 sort_result = 0;
+                for (it = mSortOrders.rbegin(); it != end_it; ++it)
                 {
-                        order = -1;
-                }
+                        S32 col_idx = it->first;
+                        BOOL sort_ascending = it->second;
 
-                BOOL retval = FALSE;
+                        cell1 = i1->getColumn(col_idx);
+                        cell2 = i2->getColumn(col_idx);
+                        // ascending or descending sort for this column?
+                        S32 order = 1;
+                        if (!sort_ascending)
+                        {
+                                order = -1;
+                        }
 
-                if (cell1 && cell2)
-                {
-                        retval = ((order * LLString::compareDict(cell1->getText(),      cell2->getText())) < 0);
+                        if (cell1 && cell2)
+                        {
+                                sort_result = (order * LLString::compareDict(cell1->getValue().asString(), cell2->getValue().asString()));
+                                if (sort_result != 0)
+                                {
+                                        // we have a sort order!
+                                        break;
+                                }
+                        }
                 }
 
-                return (retval ? TRUE : FALSE);
+                return sort_result < 0;
         }
 
-protected:
-        S32 mSortCol;
-        S32 mSortAscending;
+        typedef std::vector<std::pair<S32, BOOL> > sort_order_t;
+        const sort_order_t& mSortOrders;
 };
 
 
-
 //
 // LLScrollListIcon
 //
-LLScrollListIcon::LLScrollListIcon(LLImageGL* icon, S32 width, LLUUID image_id)
-        : mIcon(icon),
-          mImageUUID(image_id.asString()),
-          mColor(LLColor4::white)
+LLScrollListIcon::LLScrollListIcon(const LLUUID& icon_id, S32 width)
+        : LLScrollListCell(width),
+          mColor(LLColor4::white),
+          mImageUUID(icon_id)
 {
-        if (width)
-        {
-                mWidth = width;
-        }
-        else
-        {
-                mWidth = icon->getWidth();
-        }
+        // don't use default image specified by LLUUID::null, use no image in that case
+        mIcon = icon_id.isNull() ? NULL : LLUI::sImageProvider->getImageByID(icon_id);
 }
 
 LLScrollListIcon::~LLScrollListIcon()
 {
 }
 
+void LLScrollListIcon::setValue(LLSD value)
+{
+        mImageUUID = value.asUUID();
+        // don't use default image specified by LLUUID::null, use no image in that case
+        mIcon = mImageUUID.isNull() ? NULL : LLUI::sImageProvider->getImageByID(mImageUUID);
+}
+
+
 void LLScrollListIcon::setColor(const LLColor4& color)
 {
         mColor = color;
 }
 
-void LLScrollListIcon::drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const     
+S32     LLScrollListIcon::getWidth() const 
+{
+        // if no specified fix width, use width of icon
+        if (mWidth == 0)
+        {
+                return mIcon->getWidth();
+        }
+        return mWidth;
+}
+
+
+void LLScrollListIcon::draw(const LLColor4& color, const LLColor4& highlight_color) const       
 {
-        gl_draw_image(0, 0, mIcon, mColor); 
+        if (mIcon)
+        {
+                gl_draw_image(0, 0, mIcon, mColor); 
+        }
 }
 
 //
@@ -155,32 +183,32 @@ LLScrollListCheck::~LLScrollListCheck()
         delete mCheckBox;
 }
 
-void LLScrollListCheck::drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const
+void LLScrollListCheck::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
         mCheckBox->draw();
-
 }
 
 BOOL LLScrollListCheck::handleClick()
 { 
-        if ( mCheckBox->getEnabled() )
+        if (mCheckBox->getEnabled())
         {
-                LLCheckBoxCtrl::onButtonPress(mCheckBox); 
+                mCheckBox->toggle();
         }
+        // don't change selection when clicking on embedded checkbox
         return TRUE; 
 }
 
 //
 // LLScrollListSeparator
 //
-LLScrollListSeparator::LLScrollListSeparator(S32 width) : mWidth(width)
+LLScrollListSeparator::LLScrollListSeparator(S32 width) : LLScrollListCell(width)
 {
 }
 
-void LLScrollListSeparator::drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const
+void LLScrollListSeparator::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
         //*FIXME: use dynamic item heights and make separators narrow, and inactive
-        gl_line_2d(5, 8, llmax(5, width - 5), 8, color);
+        gl_line_2d(5, 8, llmax(5, getWidth() - 5), 8, color);
 }
 
 //
@@ -189,11 +217,11 @@ void LLScrollListSeparator::drawToWidth(S32 width, const LLColor4& color, const
 U32 LLScrollListText::sCount = 0;
 
 LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font, S32 width, U8 font_style, LLFontGL::HAlign font_alignment, LLColor4& color, BOOL use_color, BOOL visible)
-:       mText( text ),
+:       LLScrollListCell(width),
+        mText( text ),
         mFont( font ),
         mFontStyle( font_style ),
         mFontAlignment( font_alignment ),
-        mWidth( width ),
         mVisible( visible ),
         mHighlightCount( 0 ),
         mHighlightOffset( 0 )
@@ -213,7 +241,7 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
         // initialize rounded rect image
         if (!mRoundedRectImage)
         {
-                mRoundedRectImage = LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("rounded_square.tga")));
+                mRoundedRectImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("rounded_square.tga")));
         }
 }
 
@@ -223,6 +251,12 @@ LLScrollListText::~LLScrollListText()
         delete mColor;
 }
 
+S32     LLScrollListText::getContentWidth() const
+{
+        return mFont->getWidth(mText.getString());
+}
+
+
 void LLScrollListText::setColor(const LLColor4& color)
 {
         if (!mColor)
@@ -237,14 +271,8 @@ void LLScrollListText::setText(const LLStringExplicit& text)
         mText = text;
 }
 
-void LLScrollListText::drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const
+void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
-        // If the user has specified a small minimum width, use that.
-        if (mWidth > 0 && mWidth < width)
-        {
-                width = mWidth;
-        }
-
         const LLColor4* display_color;
         if (mColor)
         {
@@ -266,10 +294,10 @@ void LLScrollListText::drawToWidth(S32 width, const LLColor4& color, const LLCol
                         left = mFont->getWidth(mText.getString(), 0, mHighlightOffset);
                         break;
                 case LLFontGL::RIGHT:
-                        left = width - mFont->getWidth(mText.getString(), mHighlightOffset, S32_MAX);
+                        left = getWidth() - mFont->getWidth(mText.getString(), mHighlightOffset, S32_MAX);
                         break;
                 case LLFontGL::HCENTER:
-                        left = (width - mFont->getWidth(mText.getString())) / 2;
+                        left = (getWidth() - mFont->getWidth(mText.getString())) / 2;
                         break;
                 }
                 gl_segmented_rect_2d_tex(left - 2, 
@@ -291,10 +319,10 @@ void LLScrollListText::drawToWidth(S32 width, const LLColor4& color, const LLCol
                 start_x = 0.f;
                 break;
         case LLFontGL::RIGHT:
-                start_x = (F32)width;
+                start_x = (F32)getWidth();
                 break;
         case LLFontGL::HCENTER:
-                start_x = (F32)width * 0.5f;
+                start_x = (F32)getWidth() * 0.5f;
                 break;
         }
         mFont->render(mText.getWString(), 0, 
@@ -304,8 +332,10 @@ void LLScrollListText::drawToWidth(S32 width, const LLColor4& color, const LLCol
                                                 LLFontGL::BOTTOM, 
                                                 mFontStyle,
                                                 string_chars, 
-                                                width,
-                                                &right_x, FALSE, TRUE);
+                                                getWidth(),
+                                                &right_x, 
+                                                FALSE, 
+                                                TRUE);
 }
 
 
@@ -314,31 +344,6 @@ LLScrollListItem::~LLScrollListItem()
         std::for_each(mColumns.begin(), mColumns.end(), DeletePointer());
 }
 
-BOOL LLScrollListItem::handleClick(S32 x, S32 y, MASK mask)
-{
-        BOOL handled = FALSE;
-
-        S32 left = 0;
-        S32 right = 0;
-        S32 width = 0;
-
-        std::vector<LLScrollListCell *>::iterator iter = mColumns.begin();
-        std::vector<LLScrollListCell *>::iterator end = mColumns.end();
-        for ( ; iter != end; ++iter)
-        {
-                width = (*iter)->getWidth();
-                right += width;
-                if (left <= x && x < right )
-                {
-                        handled = (*iter)->handleClick();
-                        break;
-                }
-                
-                left += width;
-        }
-        return handled;
-}
-
 void LLScrollListItem::setNumColumns(S32 columns)
 {
         S32 prev_columns = mColumns.size();
@@ -375,7 +380,7 @@ LLString LLScrollListItem::getContentsCSV()
         S32 count = getNumColumns();
         for (S32 i=0; i<count; ++i)
         {
-                ret += getColumn(i)->getText();
+                ret += getColumn(i)->getValue().asString();
                 if (i < count-1)
                 {
                         ret += ", ";
@@ -385,17 +390,107 @@ LLString LLScrollListItem::getContentsCSV()
         return ret;
 }
 
+void LLScrollListItem::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
+{
+        // draw background rect
+        LLRect bg_rect = rect;
+        // pad background rectangle to separate it from contents
+        bg_rect.stretch(LIST_BORDER_PAD, 0);
+        {
+                LLGLSNoTexture no_texture;
+                glColor4fv(bg_color.mV);
+                gl_rect_2d( bg_rect );
+        }
+
+        S32 cur_x = rect.mLeft;
+        S32 num_cols = getNumColumns();
+        S32 cur_col = 0;
+
+        for (LLScrollListCell* cell = getColumn(0); cur_col < num_cols; cell = getColumn(++cur_col))
+        {
+                // Two ways a cell could be hidden
+                if (cell->getWidth() < 0
+                        || !cell->getVisible()) continue;
+
+                LLUI::pushMatrix();
+                {
+                        LLUI::translate((F32) cur_x, (F32) rect.mBottom, 0.0f);
+
+                        cell->draw( fg_color, highlight_color );
+                }
+                LLUI::popMatrix();
+                
+                cur_x += cell->getWidth() + column_padding;
+        }
+}
+
+
 void LLScrollListItem::setEnabled(BOOL b)
 {
-        if (b != mEnabled)
+        mEnabled = b;
+}
+
+//---------------------------------------------------------------------------
+// LLScrollListItemComment
+//---------------------------------------------------------------------------
+LLScrollListItemComment::LLScrollListItemComment(const LLString& comment_string, const LLColor4& color)
+: LLScrollListItem(FALSE),
+        mColor(color)
+{
+        addColumn( comment_string, gResMgr->getRes( LLFONT_SANSSERIF_SMALL ) );
+}
+
+void LLScrollListItemComment::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
+{
+        LLScrollListCell* cell = getColumn(0);
+        if (cell)
+        {
+                // Two ways a cell could be hidden
+                if (cell->getWidth() < 0
+                        || !cell->getVisible()) return;
+
+                LLUI::pushMatrix();
+                {
+                        LLUI::translate((F32)rect.mLeft, (F32)rect.mBottom, 0.0f);
+
+                        // force first cell to be width of entire item
+                        cell->setWidth(rect.getWidth());
+                        cell->draw( mColor, highlight_color );
+                }
+                LLUI::popMatrix();
+        }
+}
+
+//---------------------------------------------------------------------------
+// LLScrollListItemSeparator
+//---------------------------------------------------------------------------
+LLScrollListItemSeparator::LLScrollListItemSeparator()
+: LLScrollListItem(FALSE)
+{
+        LLScrollListSeparator* cell = new LLScrollListSeparator(0);
+        setNumColumns(1);
+        setColumn(0, cell);
+}
+
+void LLScrollListItemSeparator::draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding)
+{
+        //TODO* move LLScrollListSeparator::draw into here and get rid of it
+        LLScrollListCell* cell = getColumn(0);
+        if (cell)
         {
-                std::vector<LLScrollListCell *>::iterator iter = mColumns.begin();
-                std::vector<LLScrollListCell *>::iterator end = mColumns.end();
-                for ( ; iter != end; ++iter)
+                // Two ways a cell could be hidden
+                if (cell->getWidth() < 0
+                        || !cell->getVisible()) return;
+
+                LLUI::pushMatrix();
                 {
-                        (*iter)->setEnabled(b);
+                        LLUI::translate((F32)rect.mLeft, (F32)rect.mBottom, 0.0f);
+
+                        // force first cell to be width of entire item
+                        cell->setWidth(rect.getWidth());
+                        cell->draw( fg_color, highlight_color );
                 }
-                mEnabled = b;
+                LLUI::popMatrix();
         }
 }
 
@@ -423,10 +518,8 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mNeedsScroll(FALSE),
         mCanSelect(TRUE),
         mDisplayColumnHeaders(FALSE),
-        mCollapseEmptyColumns(FALSE),
-        mIsPopup(FALSE),
         mMaxItemCount(INT_MAX), 
-        //mItemCount(0),
+        mMaxContentWidth(0),
         mBackgroundVisible( TRUE ),
         mDrawStripes(TRUE),
         mBgWriteableColor(      LLUI::sColorsGroup->getColor( "ScrollBgWriteableColor" ) ),
@@ -443,12 +536,9 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mOnSortChangedCallback( NULL ),
         mHighlightedItem(-1),
         mBorder(NULL),
-        mDefaultColumn("SIMPLE"),
         mSearchColumn(0),
         mNumDynamicWidthColumns(0),
         mTotalStaticColumnWidth(0),
-        mSortColumn(-1),
-        mSortAscending(TRUE),
         mSorted(TRUE),
         mDirty(FALSE),
         mOriginalSelection(-1),
@@ -457,7 +547,7 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mItemListRect.setOriginAndSize(
                 mBorderThickness + LIST_BORDER_PAD,
                 mBorderThickness + LIST_BORDER_PAD,
-                mRect.getWidth() - 2*( mBorderThickness + LIST_BORDER_PAD ) - SCROLLBAR_SIZE,
+                mRect.getWidth() - 2*( mBorderThickness + LIST_BORDER_PAD ),
                 mRect.getHeight() - 2*( mBorderThickness + LIST_BORDER_PAD ) );
 
         updateLineHeight();
@@ -481,7 +571,8 @@ LLScrollListCtrl::LLScrollListCtrl(const LLString& name, const LLRect& rect,
         mScrollbar->setFollowsTop();
         mScrollbar->setFollowsBottom();
         mScrollbar->setEnabled( TRUE );
-        mScrollbar->setVisible( TRUE );
+        // scrollbar is visible only when needed
+        mScrollbar->setVisible(FALSE);
         addChild(mScrollbar);
 
         // Border
@@ -539,7 +630,8 @@ void LLScrollListCtrl::clearRows()
 
         mScrollLines = 0;
         mLastSelected = NULL;
-        updateMaxContentWidth(NULL);
+        calcMaxContentWidth(NULL);
+        updateLayout();
         mDirty = FALSE; 
 }
 
@@ -620,38 +712,64 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllData() const
         return ret;
 }
 
+// returns first matching item
+LLScrollListItem* LLScrollListCtrl::getItem(const LLSD& sd) const
+{
+        LLString string_val = sd.asString();
+
+        item_list::const_iterator iter;
+        for(iter = mItemList.begin(); iter != mItemList.end(); iter++)
+        {
+                LLScrollListItem* item  = *iter;
+                // assumes string representation is good enough for comparison
+                if (item->getValue().asString() == string_val)
+                {
+                        return item;
+                }
+        }
+        return NULL;
+}
+
 
 void LLScrollListCtrl::reshape( S32 width, S32 height, BOOL called_from_parent )
 {
-        S32 old_height = mRect.getHeight();
         LLUICtrl::reshape( width, height, called_from_parent );
 
-        S32 heading_size = (mDisplayColumnHeaders ? mHeadingHeight : 0);
+        updateLayout();
+}
 
+void LLScrollListCtrl::updateLayout()
+{
+        // reserve room for column headers, if needed
+        S32 heading_size = (mDisplayColumnHeaders ? mHeadingHeight : 0);
         mItemListRect.setOriginAndSize(
                 mBorderThickness + LIST_BORDER_PAD,
                 mBorderThickness + LIST_BORDER_PAD,
-                mRect.getWidth() - 2*( mBorderThickness + LIST_BORDER_PAD ) - SCROLLBAR_SIZE,
+                mRect.getWidth() - 2*( mBorderThickness + LIST_BORDER_PAD ),
                 mRect.getHeight() - 2*( mBorderThickness + LIST_BORDER_PAD ) - heading_size );
 
+        // how many lines of content in a single "page"
         mPageLines = mLineHeight? mItemListRect.getHeight() / mLineHeight : 0;
-        if(old_height < height && getScrollPos() == mScrollbar->getDocPosMax())
+        BOOL scrollbar_visible = getItemCount() > mPageLines;
+        if (scrollbar_visible)
         {
-                setScrollPos(mScrollbar->getDocPosMax());
+                // provide space on the right for scrollbar
+                mItemListRect.mRight = mRect.getWidth() - ( mBorderThickness + LIST_BORDER_PAD ) - SCROLLBAR_SIZE;
         }
-        mScrollbar->setVisible(mPageLines < getItemCount());
+
+        mScrollbar->reshape(SCROLLBAR_SIZE, mItemListRect.getHeight() + (mDisplayColumnHeaders ? mHeadingHeight : 0));
         mScrollbar->setPageSize( mPageLines );
-                
+        mScrollbar->setDocSize( getItemCount() );
+        mScrollbar->setVisible(scrollbar_visible);
+
         updateColumns();
 }
 
 // Attempt to size the control to show all items.
 // Do not make larger than width or height.
-void LLScrollListCtrl::arrange(S32 max_width, S32 max_height)
+void LLScrollListCtrl::fitContents(S32 max_width, S32 max_height)
 {
-        S32 height = mLineHeight * (getItemCount() + 1);
-        height = llmin( height, max_height );
-
+        S32 height = llmin( getRequiredRect().getHeight(), max_height );
         S32 width = mRect.getWidth();
 
         reshape( width, height );
@@ -660,14 +778,17 @@ void LLScrollListCtrl::arrange(S32 max_width, S32 max_height)
 
 LLRect LLScrollListCtrl::getRequiredRect()
 {
-        S32 height = mLineHeight * (getItemCount() + 1);
+        S32 heading_size = (mDisplayColumnHeaders ? mHeadingHeight : 0);
+        S32 height = (mLineHeight * getItemCount()) 
+                                + (2 * ( mBorderThickness + LIST_BORDER_PAD )) 
+                                + heading_size;
         S32 width = mRect.getWidth();
 
         return LLRect(0, height, width, 0);
 }
 
 
-BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos )
+BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos, BOOL requires_column )
 {
         BOOL not_too_big = getItemCount() < mMaxItemCount;
         if (not_too_big)
@@ -680,15 +801,22 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos )
                         break;
         
                 case ADD_SORTED:
-                        if (mSortColumn == -1)
                         {
-                                mSortColumn = 0;
-                                mSortAscending = TRUE;
-                        }
-                        mItemList.push_back(item);
-                        std::sort(mItemList.begin(), mItemList.end(), SortScrollListItem(mSortColumn, mSortAscending));
-                        break;
-        
+                                // sort by column 0, in ascending order
+                                std::vector<sort_column_t> single_sort_column;
+                                single_sort_column.push_back(std::make_pair(0, TRUE));
+
+                                mItemList.push_back(item);
+                                std::stable_sort(
+                                        mItemList.begin(), 
+                                        mItemList.end(), 
+                                        SortScrollListItem(single_sort_column));
+                                
+                                // ADD_SORTED just sorts by first column...
+                                // this might not match user sort criteria, so flag list as being in unsorted state
+                                setSorted(FALSE);
+                                break;
+                        }       
                 case ADD_BOTTOM:
                         mItemList.push_back(item);
                         setSorted(FALSE);
@@ -701,34 +829,42 @@ BOOL LLScrollListCtrl::addItem( LLScrollListItem* item, EAddPosition pos )
                         break;
                 }
         
-                updateLineHeightInsert(item);
-                mPageLines = mLineHeight ? mItemListRect.getHeight() / mLineHeight : 0;
-                BOOL scrollbar_visible = mPageLines < getItemCount();
-                
-                if (scrollbar_visible != mScrollbar->getVisible())
+                // create new column on demand
+                if (mColumns.empty() && requires_column)
                 {
-                        mScrollbar->setVisible(mPageLines < getItemCount());
-                        updateColumns();
+                        LLSD new_column;
+                        new_column["name"] = "default_column";
+                        new_column["label"] = "";
+                        new_column["dynamicwidth"] = TRUE;
+                        addColumn(new_column);
                 }
-                mScrollbar->setPageSize( mPageLines );
-        
-                mScrollbar->setDocSize( getItemCount() );
 
-                updateMaxContentWidth(item);
+                updateLineHeightInsert(item);
+                calcMaxContentWidth(item);
+
+                updateLayout();
         }
 
         return not_too_big;
 }
 
-void LLScrollListCtrl::updateMaxContentWidth(LLScrollListItem* added_item)
+void LLScrollListCtrl::calcMaxContentWidth(LLScrollListItem* added_item)
 {
         const S32 HEADING_TEXT_PADDING = 30;
         const S32 COLUMN_TEXT_PADDING = 20;
 
-        std::map<LLString, LLScrollListColumn>::iterator column_itor;
-        for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
+        if (added_item == NULL)
         {
-                LLScrollListColumn* column = &column_itor->second;
+                mMaxContentWidth = 0;
+        }
+
+        S32 item_content_width = 0;
+
+        ordered_columns_t::iterator column_itor;
+        for (column_itor = mColumnsIndexed.begin(); column_itor != mColumnsIndexed.end(); ++column_itor)
+        {
+                LLScrollListColumn* column = *column_itor;
+                if (!column) continue;
 
                 if (!added_item)
                 {
@@ -740,7 +876,7 @@ void LLScrollListCtrl::updateMaxContentWidth(LLScrollListItem* added_item)
                                 LLScrollListCell* cellp = (*iter)->getColumn(column->mIndex);
                                 if (!cellp) continue;
 
-                                column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getText()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
+                                column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
                         }
                 }
                 else
@@ -748,9 +884,13 @@ void LLScrollListCtrl::updateMaxContentWidth(LLScrollListItem* added_item)
                         LLScrollListCell* cellp = added_item->getColumn(column->mIndex);
                         if (!cellp) continue;
 
-                        column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getText()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
+                        column->mMaxContentWidth = llmax(LLFontGL::sSansSerifSmall->getWidth(cellp->getValue().asString()) + mColumnPadding + COLUMN_TEXT_PADDING, column->mMaxContentWidth);
                 }
+
+                item_content_width += column->mMaxContentWidth;
         }
+
+        mMaxContentWidth = llmax(mMaxContentWidth, item_content_width);
 }
 
 const S32 SCROLL_LIST_ROW_PAD = 2;
@@ -789,7 +929,6 @@ void LLScrollListCtrl::updateColumns()
         mColumnsIndexed.resize(mColumns.size());
 
         std::map<LLString, LLScrollListColumn>::iterator column_itor;
-        bool first_dynamic = true;
         for (column_itor = mColumns.begin(); column_itor != mColumns.end(); ++column_itor)
         {
                 LLScrollListColumn *column = &column_itor->second;
@@ -801,11 +940,6 @@ void LLScrollListCtrl::updateColumns()
                 else if (column->mDynamicWidth)
                 {
                         new_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
-                        if(first_dynamic)
-                        {
-                                first_dynamic = false;
-                                new_width += (mScrollbar->getVisible() ? 0 : SCROLLBAR_SIZE);
-                        }
                 }
 
                 if (new_width != column->mWidth)
@@ -854,48 +988,38 @@ void LLScrollListCtrl::updateColumns()
                         }
                         right = llmax(left, llmin(mItemListRect.getWidth(), right));
                         S32 header_width = right - left;
-                        
+
                         last_header->reshape(header_width, mHeadingHeight);
-                        last_header->translate(left - last_header->getRect().mLeft, top - last_header->getRect().mBottom);
+                        last_header->translate(
+                                left - last_header->getRect().mLeft,
+                                top - last_header->getRect().mBottom);
                         last_header->setVisible(mDisplayColumnHeaders && header_width > 0);
                         left = right;
                 }
         }
 
         // expand last column header we encountered to full list width
-
         if (last_header)
         {
-                S32 header_strip_width = mItemListRect.getWidth() + (mScrollbar->getVisible() ? 0 : SCROLLBAR_SIZE);
-                S32 new_width = llmax(0, mItemListRect.mLeft + header_strip_width - last_header->getRect().mLeft);
+                S32 new_width = llmax(0, mItemListRect.mRight - last_header->getRect().mLeft);
                 last_header->reshape(new_width, last_header->getRect().getHeight());
                 last_header->setVisible(mDisplayColumnHeaders && new_width > 0);
         }
-
 }
 
 void LLScrollListCtrl::setDisplayHeading(BOOL display)
 {
         mDisplayColumnHeaders = display;
 
-        updateColumns();
-
-        setHeadingHeight(mHeadingHeight);
+        updateLayout();
 }
 
 void LLScrollListCtrl::setHeadingHeight(S32 heading_height)
 {
         mHeadingHeight = heading_height;
 
-        reshape(mRect.getWidth(), mRect.getHeight());
-
-        // Resize
-        mScrollbar->reshape(SCROLLBAR_SIZE, mItemListRect.getHeight() + (mDisplayColumnHeaders ? mHeadingHeight : 0));
-}
+        updateLayout();
 
-void LLScrollListCtrl::setCollapseEmptyColumns(BOOL collapse)
-{
-        mCollapseEmptyColumns = collapse;
 }
 
 BOOL LLScrollListCtrl::selectFirstItem()
@@ -934,6 +1058,8 @@ BOOL LLScrollListCtrl::selectFirstItem()
 
 BOOL LLScrollListCtrl::selectNthItem( S32 target_index )
 {
+        if (mItemList.empty()) return FALSE;
+
         // Deselects all other items
         BOOL success = FALSE;
         S32 index = 0;
@@ -1012,7 +1138,32 @@ void LLScrollListCtrl::deleteSingleItem(S32 target_index)
         }
         delete itemp;
         mItemList.erase(mItemList.begin() + target_index);
-        updateMaxContentWidth(NULL);
+        calcMaxContentWidth(NULL);
+}
+
+//FIXME: refactor item deletion
+void LLScrollListCtrl::deleteItems(const LLSD& sd)
+{
+        item_list::iterator iter;
+        for (iter = mItemList.begin(); iter < mItemList.end(); )
+        {
+                LLScrollListItem* itemp = *iter;
+                if (itemp->getValue().asString() == sd.asString())
+                {
+                        if (itemp == mLastSelected)
+                        {
+                                mLastSelected = NULL;
+                        }
+                        delete itemp;
+                        mItemList.erase(iter++);
+                }
+                else
+                {
+                        iter++;
+                }
+        }
+
+        calcMaxContentWidth(NULL);
 }
 
 void LLScrollListCtrl::deleteSelectedItems()
@@ -1032,7 +1183,7 @@ void LLScrollListCtrl::deleteSelectedItems()
                 }
         }
         mLastSelected = NULL;
-        updateMaxContentWidth(NULL);
+        calcMaxContentWidth(NULL);
 }
 
 void LLScrollListCtrl::highlightNthItem(S32 target_index)
@@ -1108,7 +1259,8 @@ void LLScrollListCtrl::selectPrevItem( BOOL extend_selection)
 
         if (!getFirstSelected())
         {
-                selectFirstItem();
+                // select last item
+                selectNthItem(getItemCount() - 1);
         }
         else
         {
@@ -1130,7 +1282,8 @@ void LLScrollListCtrl::selectPrevItem( BOOL extend_selection)
                                 break;
                         }
 
-                        prev_item = cur_item;
+                        // don't allow navigation to disabled elements
+                        prev_item = cur_item->getEnabled() ? cur_item : prev_item;
                 }
         }
 
@@ -1145,32 +1298,34 @@ void LLScrollListCtrl::selectPrevItem( BOOL extend_selection)
 
 void LLScrollListCtrl::selectNextItem( BOOL extend_selection)
 {
+        LLScrollListItem* next_item = NULL;
+
         if (!getFirstSelected())
         {
                 selectFirstItem();
         }
         else
         {
-                item_list::iterator iter;
-                for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
+                item_list::reverse_iterator iter;
+                for (iter = mItemList.rbegin(); iter != mItemList.rend(); iter++)
                 {
-                        LLScrollListItem* item = *iter;
-                        if (item->getSelected())
+                        LLScrollListItem* cur_item = *iter;
+
+                        if (cur_item->getSelected())
                         {
-                                if (++iter != mItemList.end())
+                                if (next_item)
                                 {
-                                        LLScrollListItem *next_item = *iter;
-                                        if (next_item)
-                                        {
-                                                selectItem(next_item, !extend_selection);
-                                        }
-                                        else
-                                        {
-                                                reportInvalidInput();
-                                        }
+                                        selectItem(next_item, !extend_selection);
+                                }
+                                else
+                                {
+                                        reportInvalidInput();
                                 }
                                 break;
                         }
+
+                        // don't allow navigation to disabled items
+                        next_item = cur_item->getEnabled() ? cur_item : next_item;
                 }
         }
 
@@ -1200,27 +1355,31 @@ void LLScrollListCtrl::deselectAllItems(BOOL no_commit_on_change)
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
-// "Simple" interface: use this when you're creating a list that contains only unique strings, only
-// one of which can be selected at a time.
+// Use this to add comment text such as "Searching", which ignores column settings of list
 
-LLScrollListItem* LLScrollListCtrl::addSimpleItem(const LLString& item_text, EAddPosition pos, BOOL enabled)
+LLScrollListItem* LLScrollListCtrl::addCommentText(const LLString& comment_text, EAddPosition pos)
 {
         LLScrollListItem* item = NULL;
         if (getItemCount() < mMaxItemCount)
         {
                 // simple items have their LLSD data set to their label
-                item = new LLScrollListItem( LLSD(item_text) );
-                item->setEnabled(enabled);
-                item->addColumn( item_text, gResMgr->getRes( LLFONT_SANSSERIF_SMALL ) );
-                addItem( item, pos );
+                // always draw comment text with "enabled" color
+                item = new LLScrollListItemComment( comment_text, mFgUnselectedColor );
+                addItem( item, pos, FALSE );
         }
         return item;
 }
 
+LLScrollListItem* LLScrollListCtrl::addSeparator(EAddPosition pos)
+{
+        LLScrollListItem* item = new LLScrollListItemSeparator();
+        addItem(item, pos, FALSE);
+        return item;
+}
 
 // Selects first enabled item of the given name.
 // Returns false if item not found.
-BOOL LLScrollListCtrl::selectSimpleItem(const LLString& label, BOOL case_sensitive)
+BOOL LLScrollListCtrl::selectItemByLabel(const LLString& label, BOOL case_sensitive)
 {
         //RN: assume no empty items
         if (label.empty())
@@ -1242,7 +1401,7 @@ BOOL LLScrollListCtrl::selectSimpleItem(const LLString& label, BOOL case_sensiti
         {
                 LLScrollListItem* item = *iter;
                 // Only select enabled items with matching names
-                LLString item_text = item->getColumn(0)->getText();
+                LLString item_text = item->getColumn(0)->getValue().asString();
                 if (!case_sensitive)
                 {
                         LLString::toLower(item_text);
@@ -1265,14 +1424,14 @@ BOOL LLScrollListCtrl::selectSimpleItem(const LLString& label, BOOL case_sensiti
 }
 
 
-BOOL LLScrollListCtrl::selectSimpleItemByPrefix(const LLString& target, BOOL case_sensitive)
+BOOL LLScrollListCtrl::selectItemByPrefix(const LLString& target, BOOL case_sensitive)
 {
-        return selectSimpleItemByPrefix(utf8str_to_wstring(target), case_sensitive);
+        return selectItemByPrefix(utf8str_to_wstring(target), case_sensitive);
 }
 
 // Selects first enabled item that has a name where the name's first part matched the target string.
 // Returns false if item not found.
-BOOL LLScrollListCtrl::selectSimpleItemByPrefix(const LLWString& target, BOOL case_sensitive)
+BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sensitive)
 {
         BOOL found = FALSE;
 
@@ -1288,7 +1447,7 @@ BOOL LLScrollListCtrl::selectSimpleItemByPrefix(const LLWString& target, BOOL ca
                         LLScrollListItem* item = *iter;
                         // Only select enabled items with matching names
                         LLScrollListCell* cellp = item->getColumn(mSearchColumn);
-                        BOOL select = cellp ? item->getEnabled() && ('\0' == cellp->getText()[0]) : FALSE;
+                        BOOL select = cellp ? item->getEnabled() && ('\0' == cellp->getValue().asString()[0]) : FALSE;
                         if (select)
                         {
                                 selectItem(item);
@@ -1315,7 +1474,7 @@ BOOL LLScrollListCtrl::selectSimpleItemByPrefix(const LLWString& target, BOOL ca
                         {
                                 continue;
                         }
-                        LLWString item_label = utf8str_to_wstring(cellp->getText());
+                        LLWString item_label = utf8str_to_wstring(cellp->getValue().asString());
                         if (!case_sensitive)
                         {
                                 LLWString::toLower(item_label);
@@ -1346,14 +1505,14 @@ BOOL LLScrollListCtrl::selectSimpleItemByPrefix(const LLWString& target, BOOL ca
         return found;
 }
 
-const LLString& LLScrollListCtrl::getSimpleSelectedItem(S32 column) const
+const LLString LLScrollListCtrl::getSelectedItemLabel(S32 column) const
 {
         LLScrollListItem* item;
 
         item = getFirstSelected();
         if (item)
         {
-                return item->getColumn(column)->getText();
+                return item->getColumn(column)->getValue().asString();
         }
 
         return LLString::null;
@@ -1375,20 +1534,6 @@ LLScrollListItem* LLScrollListCtrl::addStringUUIDItem(const LLString& item_text,
         return item;
 }
 
-LLScrollListItem* LLScrollListCtrl::addSimpleItem(const LLString& item_text, LLSD sd, EAddPosition pos, BOOL enabled, S32 column_width)
-{
-        LLScrollListItem* item = NULL;
-        if (getItemCount() < mMaxItemCount)
-        {
-                item = new LLScrollListItem( sd );
-                item->setEnabled(enabled);
-                item->addColumn(item_text, gResMgr->getRes(LLFONT_SANSSERIF_SMALL), column_width);
-                addItem( item, pos );
-        }
-        return item;
-}
-
-
 // Select the line or lines that match this UUID
 BOOL LLScrollListCtrl::selectByID( const LLUUID& id )
 {
@@ -1454,7 +1599,7 @@ LLUUID LLScrollListCtrl::getStringUUIDSelectedItem()
         return LLUUID::null;
 }
 
-LLSD LLScrollListCtrl::getSimpleSelectedValue()
+LLSD LLScrollListCtrl::getSelectedValue()
 {
         LLScrollListItem* item = getFirstSelected();
 
@@ -1481,28 +1626,28 @@ void LLScrollListCtrl::drawItems()
         LLGLSUIDefault gls_ui;
         
         {
-                LLRect clip_rect = mItemListRect;
-                if(!mScrollbar->getVisible()) clip_rect.mRight += SCROLLBAR_SIZE;
-                LLLocalClipRect clip(clip_rect);
+                LLLocalClipRect clip(mItemListRect);
 
-                S32 cur_x = x;
                 S32 cur_y = y;
                 
                 mDrewSelected = FALSE;
 
                 S32 line = 0;
-                LLColor4 color;
                 S32 max_columns = 0;
 
+                LLColor4 highlight_color = LLColor4::white;
+                F32 type_ahead_timeout = LLUI::sConfigGroup->getF32("TypeAheadTimeout");
+                highlight_color.mV[VALPHA] = clamp_rescale(mSearchTimer.getElapsedTimeF32(), type_ahead_timeout * 0.7f, type_ahead_timeout, 0.4f, 0.f);
+
                 item_list::iterator iter;
                 for (iter = mItemList.begin(); iter != mItemList.end(); iter++)
                 {
                         LLScrollListItem* item = *iter;
                         
                         item_rect.setOriginAndSize( 
-                                cur_x, 
+                                x, 
                                 cur_y, 
-                                mScrollbar->getVisible() ? mItemListRect.getWidth() : mItemListRect.getWidth() + SCROLLBAR_SIZE,
+                                mItemListRect.getWidth(),
                                 mLineHeight );
 
                         //llinfos << item_rect.getWidth() << llendl;
@@ -1514,85 +1659,37 @@ void LLScrollListCtrl::drawItems()
 
                         max_columns = llmax(max_columns, item->getNumColumns());
 
-                        LLRect bg_rect = item_rect;
-                        // pad background rectangle to separate it from contents
-                        bg_rect.stretch(LIST_BORDER_PAD, 0);
+                        LLColor4 fg_color;
+                        LLColor4 bg_color(LLColor4::transparent);
 
                         if( mScrollLines <= line && line < mScrollLines + num_page_lines )
                         {
+                                fg_color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor);
                                 if( item->getSelected() && mCanSelect)
                                 {
                                         // Draw background of selected item
-                                        LLGLSNoTexture no_texture;
-                                        glColor4fv(mBgSelectedColor.mV);
-                                        gl_rect_2d( bg_rect );
-                    
-                                        color = mFgSelectedColor;
+                                        bg_color = mBgSelectedColor;
+                                        fg_color = (item->getEnabled() ? mFgSelectedColor : mFgDisabledColor);
                                 }
                                 else if (mHighlightedItem == line && mCanSelect)
                                 {
-                                        LLGLSNoTexture no_texture;
-                                        glColor4fv(mHighlightedColor.mV);
-                                        gl_rect_2d( bg_rect );
-                                        color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor);
+                                        bg_color = mHighlightedColor;
                                 }
                                 else 
                                 {
-                                        color = (item->getEnabled() ? mFgUnselectedColor : mFgDisabledColor);
-                                        if (mDrawStripes && (line%2 == 0) && (max_columns > 1))
+                                        if (mDrawStripes && (line % 2 == 0) && (max_columns > 1))
                                         {
-                                                LLGLSNoTexture no_texture;
-                                                glColor4fv(mBgStripeColor.mV);
-                                                gl_rect_2d( bg_rect );
+                                                bg_color = mBgStripeColor;
                                         }
                                 }
 
-                                S32 line_x = cur_x;
+                                if (!item->getEnabled())
                                 {
-                                        S32 num_cols = item->getNumColumns();
-                                        S32 cur_col = 0;
-                                        S32 dynamic_width = 0;
-                                        S32 dynamic_remainder = 0;
-                                        bool first_dynamic = true;
-                                        if(mNumDynamicWidthColumns > 0)
-                                        {
-                                                dynamic_width = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
-                                                dynamic_remainder = (mItemListRect.getWidth() - mTotalStaticColumnWidth) % mNumDynamicWidthColumns;
-                                        }
+                                        bg_color = mBgReadOnlyColor;
+                                }
 
-                                        for (LLScrollListCell* cell = item->getColumn(0); cur_col < num_cols; cell = item->getColumn(++cur_col))
-                                        {
-                                                S32 cell_width = cell->getWidth();
-                                                
-                                                if(mColumnsIndexed.size() > (U32)cur_col && mColumnsIndexed[cur_col] && mColumnsIndexed[cur_col]->mDynamicWidth)
-                                                {                                                       
-                                                        cell_width = dynamic_width + (--dynamic_remainder ? 1 : 0);
-                                                        if(first_dynamic)
-                                                        {
-                                                                cell_width += mScrollbar->getVisible() ? 0 : SCROLLBAR_SIZE;
-                                                                first_dynamic = false;
-                                                        }
-                                                        cell->setWidth(cell_width);
-                                                }
-                                                // Two ways a cell could be hidden
-                                                if (cell_width < 0
-                                                        || !cell->getVisible()) continue;
-
-                                                LLUI::pushMatrix();
-                                                LLUI::translate((F32) cur_x, (F32) cur_y, 0.0f);
-                                                S32 space_left = mItemListRect.mRight - cur_x;
-                                                LLColor4 highlight_color = LLColor4::white;
-                                                F32 type_ahead_timeout = LLUI::sConfigGroup->getF32("TypeAheadTimeout");
-
-                                                highlight_color.mV[VALPHA] = clamp_rescale(mSearchTimer.getElapsedTimeF32(), type_ahead_timeout * 0.7f, type_ahead_timeout, 0.4f, 0.f);
-                                                cell->drawToWidth( space_left, color, highlight_color );
-                                                LLUI::popMatrix();
-                                                
-                                                cur_x += cell_width + mColumnPadding;
+                                item->draw(item_rect, fg_color, bg_color, highlight_color, mColumnPadding);
 
-                                        }
-                                } 
-                                cur_x = line_x;                 
                                 cur_y -= mLineHeight;
                         }
                         line++;
@@ -1605,6 +1702,12 @@ void LLScrollListCtrl::draw()
 {
         if( getVisible() )
         {
+                // if user specifies sort, make sure it is maintained
+                if (needsSorting() && !isSorted())
+                {
+                        sortItems();
+                }
+
                 if (mNeedsScroll)
                 {
                         scrollToShowSelected();
@@ -1645,6 +1748,54 @@ BOOL LLScrollListCtrl::handleScrollWheel(S32 x, S32 y, S32 clicks)
         return handled;
 }
 
+BOOL LLScrollListCtrl::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
+{
+        S32 column_index = getColumnIndexFromOffset(x);
+        LLScrollListColumn* columnp = getColumn(column_index);
+
+        if (columnp == NULL) return FALSE;
+
+        BOOL handled = FALSE;
+        // show tooltip for full name of hovered item if it has been truncated
+        LLScrollListItem* hit_item = hitItem(x, y);
+        if (hit_item)
+        {
+                LLScrollListCell* hit_cell = hit_item->getColumn(column_index);
+                if (!hit_cell) return FALSE;
+                S32 cell_required_width = hit_cell->getContentWidth();
+                if (hit_cell 
+                        && hit_cell->isText() 
+                        && cell_required_width > columnp->mWidth)
+                {
+
+                        S32 rect_left = getColumnOffsetFromIndex(column_index) + mItemListRect.mLeft;
+                        S32 rect_bottom = getRowOffsetFromIndex(getItemIndex(hit_item));
+                        LLRect cell_rect;
+                        cell_rect.setOriginAndSize(rect_left, rect_bottom, rect_left + columnp->mWidth, mLineHeight);
+                        // Convert rect local to screen coordinates
+                        localPointToScreen( 
+                                cell_rect.mLeft, cell_rect.mBottom, 
+                                &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+                        localPointToScreen(
+                                cell_rect.mRight, cell_rect.mTop, 
+                                &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
+
+                        msg = hit_cell->getValue().asString();
+                        handled = TRUE;
+                }
+        }
+
+        // otherwise, look for a tooltip associated with this column
+        LLColumnHeader* headerp = columnp->mHeader;
+        if (headerp && !handled)
+        {
+                headerp->handleToolTip(x, y, msg, sticky_rect_screen);
+                handled = !msg.empty();
+        }
+
+        return handled;
+}
+
 BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
 {
         if (!mCanSelect) return FALSE;
@@ -1652,6 +1803,7 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
         BOOL selection_changed = FALSE;
 
         LLScrollListItem* hit_item = hitItem(x, y);
+
         if( hit_item )
         {
                 if( mAllowMultipleSelection )
@@ -1686,6 +1838,11 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
                                                 {
                                                         selectItem(item, FALSE);
                                                         selecting = !selecting;
+                                                        if (hit_item == lastSelected)
+                                                        {
+                                                                // stop selecting now, since we just clicked on our last selected item
+                                                                selecting = FALSE;
+                                                        }
                                                 }
                                                 if (selecting)
                                                 {
@@ -1726,9 +1883,6 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
                         selectItem(hit_item);
                 }
 
-                hit_item->handleClick(x - mBorderThickness - LIST_BORDER_PAD, 
-                                                                        1, mask);
-
                 selection_changed = mSelectionChanged;
                 if (mCommitOnSelectionChange)
                 {
@@ -1750,19 +1904,17 @@ BOOL LLScrollListCtrl::selectItemAt(S32 x, S32 y, MASK mask)
 
 BOOL LLScrollListCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-        BOOL handled = LLView::childrenHandleMouseDown(x, y, mask) != NULL;
+        BOOL handled = childrenHandleMouseDown(x, y, mask) != NULL;
 
         if( !handled )
         {
                 // set keyboard focus first, in case click action wants to move focus elsewhere
                 setFocus(TRUE);
 
-                // clear selection changed flag so because user is starting a selection operation
+                // clear selection changed flag because user is starting a selection operation
                 mSelectionChanged = FALSE;
 
-                gFocusMgr.setMouseCapture(this);
-                selectItemAt(x, y, mask);
-                mNeedsScroll = TRUE;
+                handleClick(x, y, mask);
         }
 
         return TRUE;
@@ -1798,19 +1950,79 @@ BOOL LLScrollListCtrl::handleDoubleClick(S32 x, S32 y, MASK mask)
         //BOOL handled = FALSE;
         if(getVisible())
         {
-                // Offer the click to the children, even if we aren't enabled
-                // so the scroll bars will work.
-                if (NULL == LLView::childrenHandleDoubleClick(x, y, mask))
+                BOOL handled = handleClick(x, y, mask);
+
+                if (!handled)
                 {
-                        if( mCanSelect && mOnDoubleClickCallback )
+                        // Offer the click to the children, even if we aren't enabled
+                        // so the scroll bars will work.
+                        if (NULL == LLView::childrenHandleDoubleClick(x, y, mask))
                         {
-                                mOnDoubleClickCallback( mCallbackUserData );
+                                if( mCanSelect && mOnDoubleClickCallback )
+                                {
+                                        mOnDoubleClickCallback( mCallbackUserData );
+                                }
                         }
                 }
         }
         return TRUE;
 }
 
+BOOL LLScrollListCtrl::handleClick(S32 x, S32 y, MASK mask)
+{
+        // which row was clicked on?
+        LLScrollListItem* hit_item = hitItem(x, y);
+        if (!hit_item) return FALSE;
+
+        // get appropriate cell from that row
+        S32 column_index = getColumnIndexFromOffset(x);
+        LLScrollListCell* hit_cell = hit_item->getColumn(column_index);
+        if (!hit_cell) return FALSE;
+
+        // if cell handled click directly (i.e. clicked on an embedded checkbox)
+        if (hit_cell->handleClick())
+        {
+                // if item not currently selected, select it
+                if (!hit_item->getSelected())
+                {
+                        selectItemAt(x, y, mask);
+                        gFocusMgr.setMouseCapture(this);
+                        mNeedsScroll = TRUE;
+                }
+                // otherwise we already have this item selected
+                // so propagate state of cell to rest of selected column
+                else
+                {
+                        // propagate value of this cell to other selected items
+                        // and commit the respective widgets
+                        LLSD item_value = hit_cell->getValue();
+                        for (item_list::iterator iter = mItemList.begin(); iter != mItemList.end(); iter++)
+                        {
+                                LLScrollListItem* item = *iter;
+                                if (item->getSelected())
+                                {
+                                        LLScrollListCell* cellp = item->getColumn(column_index);
+                                        cellp->setValue(item_value);
+                                        cellp->onCommit();
+                                }
+                        }
+                        //FIXME: find a better way to signal cell changes
+                        onCommit();
+                }
+                // eat click (e.g. do not trigger double click callback)
+                return TRUE;
+        }
+        else
+        {
+                // treat this as a normal single item selection
+                selectItemAt(x, y, mask);
+                gFocusMgr.setMouseCapture(this);
+                mNeedsScroll = TRUE;
+                // do not eat click (allow double click callback)
+                return FALSE;
+        }
+}
+
 LLScrollListItem* LLScrollListCtrl::hitItem( S32 x, S32 y )
 {
         // Excludes disabled items.
@@ -1847,6 +2059,59 @@ LLScrollListItem* LLScrollListCtrl::hitItem( S32 x, S32 y )
         return hit_item;
 }
 
+S32 LLScrollListCtrl::getColumnIndexFromOffset(S32 x)
+{
+        // which column did we hit?
+        S32 left = 0;
+        S32 right = 0;
+        S32 width = 0;
+        S32 column_index = 0;
+
+        ordered_columns_t::const_iterator iter = mColumnsIndexed.begin();
+        ordered_columns_t::const_iterator end = mColumnsIndexed.end();
+        for ( ; iter != end; ++iter)
+        {
+                width = (*iter)->mWidth + mColumnPadding;
+                right += width;
+                if (left <= x && x < right )
+                {
+                        break;
+                }
+                
+                // set left for next column as right of current column
+                left = right;
+                column_index++;
+        }
+
+        return llclamp(column_index, 0, getNumColumns() - 1);
+}
+
+
+S32 LLScrollListCtrl::getColumnOffsetFromIndex(S32 index)
+{
+        S32 column_offset = 0;
+        ordered_columns_t::const_iterator iter = mColumnsIndexed.begin();
+        ordered_columns_t::const_iterator end = mColumnsIndexed.end();
+        for ( ; iter != end; ++iter)
+        {
+                if (index-- <= 0)
+                {
+                        return column_offset;
+                }
+                column_offset += (*iter)->mWidth + mColumnPadding;
+        }
+
+        // when running off the end, return the rightmost pixel
+        return mItemListRect.mRight;
+}
+
+S32 LLScrollListCtrl::getRowOffsetFromIndex(S32 index)
+{
+        S32 row_bottom = ((mItemListRect.mTop - (index - mScrollLines)) * mLineHeight) 
+                                                - mLineHeight;
+        return row_bottom;
+}
+
 
 BOOL LLScrollListCtrl::handleHover(S32 x,S32 y,MASK mask)
 {
@@ -1860,7 +2125,8 @@ BOOL LLScrollListCtrl::handleHover(S32 x,S32 y,MASK mask)
                         mNeedsScroll = TRUE;
                 }
         }
-        else if (mCanSelect)
+        else 
+        if (mCanSelect)
         {
                 LLScrollListItem* item = hitItem(x, y);
                 if (item)
@@ -1875,13 +2141,6 @@ BOOL LLScrollListCtrl::handleHover(S32 x,S32 y,MASK mask)
 
         handled = LLUICtrl::handleHover( x, y, mask );
 
-        //if( !handled )
-        //{
-        //      // Opaque
-        //      getWindow()->setCursor(UI_CURSOR_ARROW);
-        //      lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;              
-        //      handled = TRUE;
-        //}
         return handled;
 }
 
@@ -1998,7 +2257,7 @@ BOOL LLScrollListCtrl::handleKeyHere(KEY key,MASK mask, BOOL called_from_parent
                                                 }
                                         }
                                 }
-                                else if (selectSimpleItemByPrefix(wstring_to_utf8str(mSearchString), FALSE))
+                                else if (selectItemByPrefix(wstring_to_utf8str(mSearchString), FALSE))
                                 {
                                         mNeedsScroll = TRUE;
                                         // update search string only on successful match
@@ -2037,7 +2296,7 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_
         // type ahead search is case insensitive
         uni_char = LLStringOps::toLower((llwchar)uni_char);
 
-        if (selectSimpleItemByPrefix(wstring_to_utf8str(mSearchString + (llwchar)uni_char), FALSE))
+        if (selectItemByPrefix(wstring_to_utf8str(mSearchString + (llwchar)uni_char), FALSE))
         {
                 // update search string only on successful match
                 mNeedsScroll = TRUE;
@@ -2082,7 +2341,7 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char, BOOL called_from_
                         if (cellp)
                         {
                                 // Only select enabled items with matching first characters
-                                LLWString item_label = utf8str_to_wstring(cellp->getText());
+                                LLWString item_label = utf8str_to_wstring(cellp->getValue().asString());
                                 if (item->getEnabled() && LLStringOps::toLower(item_label[0]) == uni_char)
                                 {
                                         selectItem(item);
@@ -2176,7 +2435,7 @@ void LLScrollListCtrl::deselectItem(LLScrollListItem* itemp)
                 LLScrollListCell* cellp = itemp->getColumn(mSearchColumn);
                 if (cellp)
                 {
-                        cellp->highlightText(0, 0);
+                        cellp->highlightText(0, 0);     
                 }
                 mSelectionChanged = TRUE;
         }
@@ -2202,38 +2461,52 @@ BOOL LLScrollListCtrl::isSorted()
         return mSorted;
 }
 
-// Called by scrollbar
-//static
-void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar, void* userdata )
+struct SameSortColumn
 {
-        LLScrollListCtrl* self = (LLScrollListCtrl*) userdata;
-        self->mScrollLines = new_pos;
-}
+        SameSortColumn(S32 column) : mColumn(column) {}
+        S32 mColumn;
 
+        bool operator()(std::pair<S32, BOOL> sort_column) { return sort_column.first == mColumn; }
+};
 
-// First column is column 0
-void  LLScrollListCtrl::sortByColumn(U32 column, BOOL ascending)
+BOOL LLScrollListCtrl::setSort(S32 column, BOOL ascending)
 {
-        if (!mSorted || mSortColumn != column)
+        sort_column_t new_sort_column(column, ascending);
+
+        if (mSortColumns.empty())
         {
-                mSortColumn = column;
-                std::sort(mItemList.begin(), mItemList.end(), SortScrollListItem(mSortColumn, mSortAscending));
-                setSorted(TRUE);
+                mSortColumns.push_back(new_sort_column);
+                return TRUE;
         }
+        else
+        {       
+                // grab current sort column
+                sort_column_t cur_sort_column = mSortColumns.back();
+                
+                // remove any existing sort criterion referencing this column
+                // and add the new one
+                mSortColumns.erase(remove_if(mSortColumns.begin(), mSortColumns.end(), SameSortColumn(column)), mSortColumns.end()); 
+                mSortColumns.push_back(new_sort_column);
 
-        // just reverse the list if changing sort order
-        if(mSortAscending != ascending)
-        {
-                std::reverse(mItemList.begin(), mItemList.end());
-                mSortAscending = ascending;
+                // did the sort criteria change?
+                return (cur_sort_column != new_sort_column);
         }
 }
 
+// Called by scrollbar
+//static
+void LLScrollListCtrl::onScrollChange( S32 new_pos, LLScrollbar* scrollbar, void* userdata )
+{
+        LLScrollListCtrl* self = (LLScrollListCtrl*) userdata;
+        self->mScrollLines = new_pos;
+}
+
+
 void LLScrollListCtrl::sortByColumn(LLString name, BOOL ascending)
 {
         if (name.empty())
         {
-                sortByColumn(mSortColumn, mSortAscending);
+                sortItems();
                 return;
         }
 
@@ -2244,6 +2517,26 @@ void LLScrollListCtrl::sortByColumn(LLString name, BOOL ascending)
         }
 }
 
+// First column is column 0
+void  LLScrollListCtrl::sortByColumn(U32 column, BOOL ascending)
+{
+        if (setSort(column, ascending))
+        {
+                sortItems();
+        }
+}
+
+void LLScrollListCtrl::sortItems()
+{
+        // do stable sort to preserve any previous sorts
+        std::stable_sort(
+                mItemList.begin(), 
+                mItemList.end(), 
+                SortScrollListItem(mSortColumns));
+
+        setSorted(TRUE);
+}
+
 S32 LLScrollListCtrl::getScrollPos()
 {
         return mScrollbar->getDocPos();
@@ -2431,9 +2724,6 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
         BOOL draw_heading = FALSE;
         node->getAttributeBOOL("draw_heading", draw_heading);
 
-        BOOL collapse_empty_columns = FALSE;
-        node->getAttributeBOOL("collapse_empty_columns", collapse_empty_columns);
-
         S32 search_column = 0;
         node->getAttributeS32("search_column", search_column);
 
@@ -2454,7 +2744,6 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                 node->getAttributeS32("heading_height", heading_height);
                 scroll_list->setHeadingHeight(heading_height);
         }
-        scroll_list->setCollapseEmptyColumns(collapse_empty_columns);
 
         scroll_list->setScrollListParameters(node);
 
@@ -2465,7 +2754,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
         LLSD columns;
         S32 index = 0;
         LLXMLNodePtr child;
-        S32 total_static = 0, num_dynamic = 0;
+        S32 total_static = 0;
         for (child = node->getFirstChild(); child.notNull(); child = child->getNextSibling())
         {
                 if (child->hasName("column"))
@@ -2491,8 +2780,10 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                         S32 columnwidth = -1;
                         child->getAttributeS32("width", columnwidth);   
 
-                        if(!columndynamicwidth) total_static += columnwidth;
-                        else ++num_dynamic;
+                        LLString tooltip;
+                        child->getAttributeString("tool_tip", tooltip);
+
+                        if(!columndynamicwidth) total_static += llmax(0, columnwidth);
 
                         F32 columnrelwidth = 0.f;
                         child->getAttributeF32("relwidth", columnrelwidth);
@@ -2509,10 +2800,11 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                         columns[index]["relwidth"] = columnrelwidth;
                         columns[index]["dynamicwidth"] = columndynamicwidth;
                         columns[index]["halign"] = (S32)h_align;
+                        columns[index]["tool_tip"] = tooltip;
+                        
                         index++;
                 }
         }
-        scroll_list->setNumDynamicColumns(num_dynamic);
         scroll_list->setTotalStaticColumnWidth(total_static);
         scroll_list->setColumnHeadings(columns);
 
@@ -2566,7 +2858,7 @@ LLView* LLScrollListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFac
                 while(token_iter != tokens.end())
                 {
                         const char* line = token_iter->c_str();
-                        scroll_list->addSimpleItem(line);
+                        scroll_list->addSimpleElement(line);
                         ++token_iter;
                 }
         }
@@ -2663,10 +2955,6 @@ BOOL	LLScrollListCtrl::canDeselect()
 void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
 {
         LLString name = column["name"].asString();
-        if (mColumns.empty())
-        {
-                mDefaultColumn = 0;
-        }
         // if no column name provided, just use ordinal as name
         if (name.empty())
         {
@@ -2691,6 +2979,7 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
                         }
                         else if(new_column->mDynamicWidth)
                         {
+                                mNumDynamicWidthColumns++;
                                 new_column->mWidth = (mItemListRect.getWidth() - mTotalStaticColumnWidth) / mNumDynamicWidthColumns;
                         }
                         S32 top = mItemListRect.mTop;
@@ -2724,19 +3013,19 @@ void LLScrollListCtrl::addColumn(const LLSD& column, EAddPosition pos)
                                 new_column->mHeader->setLabel(new_column->mLabel);
                                 //new_column->mHeader->setLabel(new_column->mLabel);
                         }
+
+                        new_column->mHeader->setToolTip(column["tool_tip"].asString());
+
                         //RN: although it might be useful to change sort order with the keyboard,
                         // mixing tab stops on child items along with the parent item is not supported yet
                         new_column->mHeader->setTabStop(FALSE);
                         addChild(new_column->mHeader);
                         new_column->mHeader->setVisible(mDisplayColumnHeaders);
 
-
-                        // Move scroll to front
-                        removeChild(mScrollbar);
-                        addChild(mScrollbar);
-                
+                        sendChildToFront(mScrollbar);
                 }
         }
+
         updateColumns();
 }
 
@@ -2753,18 +3042,18 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
 
         LLScrollListColumn* column = parent->mColumnsIndexed[info->mIndex];
         bool ascending = column->mSortAscending;
-        if (column->mSortingColumn != column->mName)
+        if (column->mSortingColumn != column->mName
+                && parent->mColumns.find(column->mSortingColumn) != parent->mColumns.end())
         {
-                if (parent->mColumns.find(column->mSortingColumn) != parent->mColumns.end())
-                {
-                        LLScrollListColumn& info_redir = parent->mColumns[column->mSortingColumn];
-                        column_index = info_redir.mIndex;
-                }
+                LLScrollListColumn& info_redir = parent->mColumns[column->mSortingColumn];
+                column_index = info_redir.mIndex;
         }
 
-        if (column_index == parent->mSortColumn)
+        // if this column is the primary sort key, reverse the direction
+        sort_column_t cur_sort_column;
+        if (!parent->mSortColumns.empty() && parent->mSortColumns.back().first == column_index)
         {
-                ascending = !parent->mSortAscending;
+                ascending = !parent->mSortColumns.back().second;
         }
 
         parent->sortByColumn(column_index, ascending);
@@ -2777,12 +3066,17 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
 
 std::string LLScrollListCtrl::getSortColumnName()
 {
-        LLScrollListColumn* column = mSortColumn >= 0 ? mColumnsIndexed[mSortColumn] : NULL;
+        LLScrollListColumn* column = mSortColumns.empty() ? NULL : mColumnsIndexed[mSortColumns.back().first];
 
         if (column) return column->mName;
         else return "";
 }
 
+BOOL LLScrollListCtrl::needsSorting()
+{
+        return !mSortColumns.empty();
+}
+
 void LLScrollListCtrl::clearColumns()
 {
         std::map<LLString, LLScrollListColumn>::iterator itor;
@@ -2796,6 +3090,7 @@ void LLScrollListCtrl::clearColumns()
                 }
         }
         mColumns.clear();
+        mSortColumns.clear();
 }
 
 void LLScrollListCtrl::setColumnLabel(const LLString& column, const LLString& label)
@@ -2849,12 +3144,12 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
         S32 col_index = 0 ;
         for (itor = columns.beginArray(); itor != columns.endArray(); ++itor)
         {
-                LLString column = (*itor)["column"].asString();
-
-                if (mColumns.size() == 0)
+                if (itor->isUndefined())
                 {
-                        mDefaultColumn = 0;
+                        // skip unused columns in item passed in
+                        continue;
                 }
+                LLString column = (*itor)["column"].asString();
 
                 LLScrollListColumn* columnp = NULL;
 
@@ -2879,9 +3174,18 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                         LLSD new_column;
                         new_column["name"] = column;
                         new_column["label"] = column;
-                        new_column["width"] = (*itor)["width"];
+                        // if width supplied for column, use it, otherwise 
+                        // use adaptive width
+                        if (itor->has("width"))
+                        {
+                                new_column["width"] = (*itor)["width"];
+                        }
+                        else
+                        {
+                                new_column["dynamicwidth"] = true;
+                        }
                         addColumn(new_column);
-                        columnp = &mColumns.find(column)->second;
+                        columnp = &mColumns[column];
                         new_item->setNumColumns(mColumns.size());
                 }
 
@@ -2895,6 +3199,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 LLString type = (*itor)["type"].asString();
                 BOOL has_color = (*itor).has("color");
                 LLColor4 color = ((*itor)["color"]);
+                BOOL enabled = !(*itor).has("enabled") || (*itor)["enabled"].asBoolean() == true;
 
                 const LLFontGL *font = gResMgr->getRes(fontname);
                 if (!font)
@@ -2906,8 +3211,7 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 if (type == "icon")
                 {
                         LLUUID image_id = value.asUUID();
-                        LLImageGL* icon = LLUI::sImageProvider->getUIImageByID(image_id);
-                        LLScrollListIcon* cell = new LLScrollListIcon(icon, width, image_id);
+                        LLScrollListIcon* cell = new LLScrollListIcon(value.asUUID(), width);
                         if (has_color)
                         {
                                 cell->setColor(color);
@@ -2916,8 +3220,10 @@ LLScrollListItem* LLScrollListCtrl::addElement(const LLSD& value, EAddPosition p
                 }
                 else if (type == "checkbox")
                 {
-                        LLCheckBoxCtrl* ctrl = new LLCheckBoxCtrl(value.asString(),
-                                                                                                                LLRect(0, 0, width, width), "label");
+                        LLCheckBoxCtrl* ctrl = new LLCheckBoxCtrl("check",
+                                                                                                                LLRect(0, width, width, 0), " ");
+                        ctrl->setEnabled(enabled);
+                        ctrl->setValue(value);
                         LLScrollListCheck* cell = new LLScrollListCheck(ctrl,width);
                         if (has_color)
                         {
@@ -3070,18 +3376,12 @@ void LLScrollListCtrl::onFocusReceived()
 {
         // forget latent selection changes when getting focus
         mSelectionChanged = FALSE;
+        LLUICtrl::onFocusReceived();
 }
 
 //virtual 
 void LLScrollListCtrl::onFocusLost()
 {
-        if (mIsPopup)
-        {
-                if (getParent())
-                {
-                        getParent()->onFocusLost();
-                }
-        }
         if (hasMouseCapture())
         {
                 gFocusMgr.setMouseCapture(NULL);
@@ -3133,11 +3433,11 @@ void LLColumnHeader::draw()
 {
         if( getVisible() )
         {
-                mDrawArrow = !mColumn->mLabel.empty() && mColumn->mParentCtrl->isSorted() && mColumn->mParentCtrl->getSortColumnName() == mColumn->mSortingColumn;
+                BOOL draw_arrow = !mColumn->mLabel.empty() && mColumn->mParentCtrl->isSorted() && mColumn->mParentCtrl->getSortColumnName() == mColumn->mSortingColumn;
 
                 BOOL is_ascending = mColumn->mParentCtrl->getSortAscending();
-                mArrowImage = is_ascending ? LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("up_arrow.tga")))
-                        : LLUI::sImageProvider->getUIImageByID(LLUUID(LLUI::sAssetsGroup->getString("down_arrow.tga")));
+                mButton->setImageOverlay(is_ascending ? "up_arrow.tga" : "down_arrow.tga", LLFontGL::RIGHT, draw_arrow ? LLColor4::white : LLColor4::transparent);
+                mArrowImage = mButton->getImageOverlay()->getImage();
 
                 //BOOL clip = mRect.mRight > mColumn->mParentCtrl->getItemListRect().getWidth();
                 //LLGLEnable scissor_test(clip ? GL_SCISSOR_TEST : GL_FALSE);
@@ -3237,11 +3537,11 @@ void LLColumnHeader::showList()
                         {
                                 if (mColumn->mParentCtrl->getSortAscending())
                                 {
-                                        low_item_text = cell->getText();
+                                        low_item_text = cell->getValue().asString();
                                 }
                                 else
                                 {
-                                        high_item_text = cell->getText();
+                                        high_item_text = cell->getValue().asString();
                                 }
                         }
                 }
@@ -3254,11 +3554,11 @@ void LLColumnHeader::showList()
                         {
                                 if (mColumn->mParentCtrl->getSortAscending())
                                 {
-                                        high_item_text = cell->getText();
+                                        high_item_text = cell->getValue().asString();
                                 }
                                 else
                                 {
-                                        low_item_text = cell->getText();
+                                        low_item_text = cell->getValue().asString();
                                 }
                         }
                 }
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index c548727..ada4f9b 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -56,20 +56,26 @@ class LLResizeBar;
 class LLScrollListCell
 {
 public:
+        LLScrollListCell(S32 width = 0) : mWidth(width) {};
         virtual ~LLScrollListCell() {};
-        virtual void                    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const = 0;               // truncate to given width, if possible
-        virtual S32                             getWidth() const = 0;
+        virtual void                    draw(const LLColor4& color, const LLColor4& highlight_color) const = 0;         // truncate to given width, if possible
+        virtual S32                             getWidth() const {return mWidth;}
+        virtual S32                             getContentWidth() const { return 0; }
         virtual S32                             getHeight() const = 0;
-        virtual const LLString& getText() const { return LLString::null; }
-        virtual const LLString& getTextLower() const { return LLString::null; }
+        virtual const LLSD              getValue() const { return LLString::null; }
+        virtual void                    setValue(LLSD value) { }
         virtual BOOL                    getVisible() const { return TRUE; }
-        virtual void                    setWidth(S32 width) = 0;
+        virtual void                    setWidth(S32 width) { mWidth = width; }
         virtual void                    highlightText(S32 offset, S32 num_chars) {}
         virtual BOOL                    isText() = 0;
-        virtual void                    setColor(const LLColor4&) = 0;
+        virtual void                    setColor(const LLColor4&) {}
+        virtual void                    onCommit() {};
 
         virtual BOOL    handleClick() { return FALSE; }
         virtual void    setEnabled(BOOL enable) { }
+
+protected:
+        S32 mWidth;
 };
 
 class LLScrollListSeparator : public LLScrollListCell
@@ -77,15 +83,9 @@ class LLScrollListSeparator : public LLScrollListCell
 public:
         LLScrollListSeparator(S32 width);
         virtual ~LLScrollListSeparator() {};
-        virtual void                    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;           // truncate to given width, if possible
-        virtual S32                             getWidth() const {return mWidth;}
+        virtual void                    draw(const LLColor4& color, const LLColor4& highlight_color) const;             // truncate to given width, if possible
         virtual S32                             getHeight() const { return 5; };
-        virtual void                    setWidth(S32 width) {mWidth = width; }
-        virtual void                    setColor(const LLColor4&) {};
         virtual BOOL                    isText() { return FALSE; }
-
-protected:
-        S32 mWidth;
 };
 
 class LLScrollListText : public LLScrollListCell
@@ -94,24 +94,25 @@ public:
         LLScrollListText( const LLString& text, const LLFontGL* font, S32 width = 0, U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, LLColor4& color = LLColor4::black, BOOL use_color = FALSE, BOOL visible = TRUE);
         /*virtual*/ ~LLScrollListText();
 
-        virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
-        virtual S32             getWidth() const                        { return mWidth; }
-        virtual void    setWidth(S32 width)                     { mWidth = width; }
+        virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
+        virtual S32             getContentWidth() const;
         virtual S32             getHeight() const                       { return llround(mFont->getLineHeight()); }
-        virtual const LLString&         getText() const         { return mText.getString(); }
+        virtual const LLSD              getValue() const                { return LLSD(mText.getString()); }
         virtual BOOL    getVisible() const  { return mVisible; }
         virtual void    highlightText(S32 offset, S32 num_chars) {mHighlightOffset = offset; mHighlightCount = num_chars;}
-        void                    setText(const LLStringExplicit& text);
+
         virtual void    setColor(const LLColor4&);
         virtual BOOL    isText() { return TRUE; }
 
+        void                    setText(const LLStringExplicit& text);
+        void                    setFontStyle(const U8 font_style) { mFontStyle = font_style; }
+
 private:
         LLUIString              mText;
         const LLFontGL* mFont;
         LLColor4*               mColor;
-        const U8                mFontStyle;
+        U8                              mFontStyle;
         LLFontGL::HAlign mFontAlignment;
-        S32                             mWidth;
         BOOL                    mVisible;
         S32                             mHighlightCount;
         S32                             mHighlightOffset;
@@ -124,21 +125,20 @@ private:
 class LLScrollListIcon : public LLScrollListCell
 {
 public:
-        LLScrollListIcon( LLImageGL* icon, S32 width = 0, LLUUID image_id = LLUUID::null);
+        LLScrollListIcon( const LLUUID& icon_id, S32 width = 0);
         /*virtual*/ ~LLScrollListIcon();
-        virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
-        virtual S32             getWidth() const                        { return mWidth; }
-        virtual S32             getHeight() const                       { return mIcon->getHeight(); }
-        virtual const LLString& getText() const { return mImageUUID; }
-        virtual const LLString& getTextLower() const { return mImageUUID; }
-        virtual void    setWidth(S32 width)                     { mWidth = width; }
+        virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
+        virtual S32             getWidth() const;
+        virtual S32             getHeight() const                       { return mIcon ? mIcon->getHeight() : 0; }
+        // used as sort criterion
+        virtual const LLSD              getValue() const { return LLSD(mImageUUID); }
         virtual void    setColor(const LLColor4&);
         virtual BOOL    isText() { return FALSE; }
+        virtual void    setValue(LLSD value);
 
 private:
         LLPointer<LLImageGL> mIcon;
-        LLString mImageUUID;
-        S32 mWidth;
+        LLUUID mImageUUID;
         LLColor4 mColor;
 };
 
@@ -147,21 +147,20 @@ class LLScrollListCheck : public LLScrollListCell
 public:
         LLScrollListCheck( LLCheckBoxCtrl* check_box, S32 width = 0);
         /*virtual*/ ~LLScrollListCheck();
-        virtual void    drawToWidth(S32 width, const LLColor4& color, const LLColor4& highlight_color) const;
-        virtual S32             getWidth() const                        { return mWidth; }
+        virtual void    draw(const LLColor4& color, const LLColor4& highlight_color) const;
         virtual S32             getHeight() const                       { return 0; } 
-        virtual void    setWidth(S32 width)                     { mWidth = width; }
+        virtual const LLSD      getValue() const { return mCheckBox->getValue(); }
+        virtual void    setValue(LLSD value) { mCheckBox->setValue(value); }
+        virtual void    onCommit() { mCheckBox->onCommit(); }
 
         virtual BOOL    handleClick();
-        virtual void    setEnabled(BOOL enable)         { if (mCheckBox) mCheckBox->setEnabled(enable); }
-        virtual void    setColor(const LLColor4& color) {};
+        virtual void    setEnabled(BOOL enable)         { mCheckBox->setEnabled(enable); }
 
         LLCheckBoxCtrl* getCheckBox()                           { return mCheckBox; }
         virtual BOOL    isText() { return FALSE; }
 
 private:
         LLCheckBoxCtrl* mCheckBox;
-        S32 mWidth;
 };
 
 class LLScrollListColumn
@@ -266,6 +265,7 @@ public:
 
         /*virtual*/ void draw();
         /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
+
         /*virtual*/ void showList();
         /*virtual*/ LLView*     findSnapEdge(S32& new_edge_val, const LLCoordGL& mouse_dir, ESnapEdge snap_edge, ESnapType snap_type, S32 threshold, S32 padding);
         /*virtual*/ void userSetShape(const LLRect& new_rect);
@@ -319,8 +319,8 @@ public:
         void    addColumn( const LLString& text, const LLFontGL* font, S32 width = 0 , U8 font_style = LLFontGL::NORMAL, LLFontGL::HAlign font_alignment = LLFontGL::LEFT, BOOL visible = TRUE)
                                 { mColumns.push_back( new LLScrollListText(text, font, width, font_style, font_alignment, LLColor4::black, FALSE, visible) ); }
 
-        void    addColumn( LLImageGL* icon, S32 width = 0 )
-                                { mColumns.push_back( new LLScrollListIcon(icon, width) ); }
+        void    addColumn( const LLUUID& icon_id, S32 width = 0 )
+                                { mColumns.push_back( new LLScrollListIcon(icon_id, width) ); }
 
         void    addColumn( LLCheckBoxCtrl* check, S32 width = 0 )
                                 { mColumns.push_back( new LLScrollListCheck(check,width) ); }
@@ -333,10 +333,10 @@ public:
 
         LLScrollListCell *getColumn(const S32 i) const  { if (0 <= i && i < (S32)mColumns.size()) { return mColumns[i]; } return NULL; }
 
-        virtual BOOL handleClick(S32 x, S32 y, MASK mask);
-
         LLString getContentsCSV();
 
+        virtual void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
+
 private:
         BOOL    mSelected;
         BOOL    mEnabled;
@@ -345,6 +345,23 @@ private:
         std::vector<LLScrollListCell *> mColumns;
 };
 
+class LLScrollListItemComment : public LLScrollListItem
+{
+public:
+        LLScrollListItemComment(const LLString& comment_string, const LLColor4& color);
+
+        /*virtual*/ void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
+private:
+        LLColor4 mColor;
+};
+
+class LLScrollListItemSeparator : public LLScrollListItem
+{
+public:
+        LLScrollListItemSeparator();
+
+        /*virtual*/ void draw(const LLRect& rect, const LLColor4& fg_color, const LLColor4& bg_color, const LLColor4& highlight_color, S32 column_padding);
+};
 
 class LLScrollListCtrl : public LLUICtrl, public LLEditMenuHandler, 
         public LLCtrlListInterface, public LLCtrlScrollInterface
@@ -370,9 +387,8 @@ public:
         void                    deleteAllItems() { clearRows(); }
         
         // Sets an array of column descriptors
-        void                     setColumnHeadings(LLSD headings);
-        // Numerical based sort by column function (used by LLComboBox)
-        void                     sortByColumn(U32 column, BOOL ascending);
+        void                    setColumnHeadings(LLSD headings);
+        void                    sortByColumn(U32 column, BOOL ascending);
         
         // LLCtrlListInterface functions
         virtual S32  getItemCount() const;
@@ -390,7 +406,6 @@ public:
         virtual LLScrollListItem* addElement(const LLSD& value, EAddPosition pos = ADD_BOTTOM, void* userdata = NULL);
         // Simple add element. Takes a single array of:
         // [ "value" => value, "font" => font, "font-style" => style ]
-        virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
         virtual void clearRows(); // clears all elements
         virtual void sortByColumn(LLString name, BOOL ascending);
 
@@ -421,18 +436,20 @@ public:
         BOOL                    isSorted();
 
         virtual BOOL    isSelected(LLSD value);
-        
+
+        BOOL                    handleClick(S32 x, S32 y, MASK mask);
         BOOL                    selectFirstItem();
         BOOL                    selectNthItem( S32 index );
         BOOL                    selectItemAt(S32 x, S32 y, MASK mask);
         
-        void                    deleteSingleItem( S32 index ) ;
+        void                    deleteSingleItem( S32 index );
+        void                    deleteItems(const LLSD& sd);
         void                    deleteSelectedItems();
         void                    deselectAllItems(BOOL no_commit_on_change = FALSE);     // by default, go ahead and commit on selection change
 
         void                    highlightNthItem( S32 index );
         void                    setDoubleClickCallback( void (*cb)(void*) ) { mOnDoubleClickCallback = cb; }
-        void                    setMaxiumumSelectCallback( void (*cb)(void*) ) { mOnMaximumSelectCallback = cb; }
+        void                    setMaximumSelectCallback( void (*cb)(void*) ) { mOnMaximumSelectCallback = cb; }
         void                    setSortChangedCallback( void (*cb)(void*) ) { mOnSortChangedCallback = cb; }
 
         void                    swapWithNext(S32 index);
@@ -444,19 +461,21 @@ public:
         S32                             getItemIndex( LLScrollListItem* item );
         S32                             getItemIndex( LLUUID& item_id );
 
+        LLScrollListItem* addCommentText( const LLString& comment_text, EAddPosition pos = ADD_BOTTOM);
+        LLScrollListItem* addSeparator(EAddPosition pos);
+
         // "Simple" interface: use this when you're creating a list that contains only unique strings, only
         // one of which can be selected at a time.
-        LLScrollListItem* addSimpleItem( const LLString& item_text, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE );
-        // Add an item with an associated LLSD
-        LLScrollListItem* addSimpleItem(const LLString& item_text, LLSD sd, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0 );
+        virtual LLScrollListItem* addSimpleElement(const LLString& value, EAddPosition pos = ADD_BOTTOM, const LLSD& id = LLSD());
+
 
-        BOOL                    selectSimpleItem( const LLString& item, BOOL case_sensitive = TRUE );           // FALSE if item not found
-        BOOL                    selectSimpleItemByPrefix(const LLString& target, BOOL case_sensitive);
-        BOOL                    selectSimpleItemByPrefix(const LLWString& target, BOOL case_sensitive);
-        const LLString& getSimpleSelectedItem(S32 column = 0) const;
-        LLSD                    getSimpleSelectedValue();
+        BOOL                    selectItemByLabel( const LLString& item, BOOL case_sensitive = TRUE );          // FALSE if item not found
+        BOOL                    selectItemByPrefix(const LLString& target, BOOL case_sensitive = TRUE);
+        BOOL                    selectItemByPrefix(const LLWString& target, BOOL case_sensitive = TRUE);
+        const LLString  getSelectedItemLabel(S32 column = 0) const;
+        LLSD                    getSelectedValue();
 
-        // DEPRECATED: Use LLSD versions of addSimpleItem() and getSimpleSelectedValue().
+        // DEPRECATED: Use LLSD versions of addCommentText() and getSelectedValue().
         // "StringUUID" interface: use this when you're creating a list that contains non-unique strings each of which
         // has an associated, unique UUID, and only one of which can be selected at a time.
         LLScrollListItem*       addStringUUIDItem(const LLString& item_text, const LLUUID& id, EAddPosition pos = ADD_BOTTOM, BOOL enabled = TRUE, S32 column_width = 0);
@@ -472,6 +491,8 @@ public:
         LLScrollListItem*       getFirstData() const;
         LLScrollListItem*       getLastData() const;
         std::vector<LLScrollListItem*>  getAllData() const;
+
+        LLScrollListItem*       getItem(const LLSD& sd) const;
         
         void setAllowMultipleSelection(BOOL mult )      { mAllowMultipleSelection = mult; }
 
@@ -501,28 +522,34 @@ public:
 
         S32                             getSearchColumn() { return mSearchColumn; }
         void                    setSearchColumn(S32 column) { mSearchColumn = column; }
+        S32                             getColumnIndexFromOffset(S32 x);
+        S32                             getColumnOffsetFromIndex(S32 index);
+        S32                             getRowOffsetFromIndex(S32 index);
 
         void                    clearSearchString() { mSearchString.clear(); }
 
         // Overridden from LLView
-        virtual void    draw();
-        virtual BOOL    handleMouseDown(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleMouseUp(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleDoubleClick(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
-        virtual BOOL    handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
-        virtual BOOL    handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
-        virtual BOOL    handleScrollWheel(S32 x, S32 y, S32 clicks);
-        virtual void    setEnabled(BOOL enabled);
-        virtual void    setFocus( BOOL b );
-        virtual void    onFocusReceived();
-        virtual void    onFocusLost();
+        /*virtual*/ void    draw();
+        /*virtual*/ BOOL        handleMouseDown(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleMouseUp(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleDoubleClick(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleHover(S32 x, S32 y, MASK mask);
+        /*virtual*/ BOOL        handleKeyHere(KEY key, MASK mask, BOOL called_from_parent);
+        /*virtual*/ BOOL        handleUnicodeCharHere(llwchar uni_char, BOOL called_from_parent);
+        /*virtual*/ BOOL        handleScrollWheel(S32 x, S32 y, S32 clicks);
+        /*virtual*/ BOOL        handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect);
+        /*virtual*/ void        setEnabled(BOOL enabled);
+        /*virtual*/ void        setFocus( BOOL b );
+        /*virtual*/ void        onFocusReceived();
+        /*virtual*/ void        onFocusLost();
+        /*virtual*/ void        reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 
         virtual BOOL    isDirty() const;
         virtual void    resetDirty();           // Clear dirty state
 
-        virtual void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
-        virtual void    arrange(S32 max_width, S32 max_height);
+        virtual void    updateLayout();
+        virtual void    fitContents(S32 max_width, S32 max_height);
+
         virtual LLRect  getRequiredRect();
         static  BOOL    rowPreceeds(LLScrollListItem *new_row, LLScrollListItem *test_row);
 
@@ -534,12 +561,12 @@ public:
         static void onClickColumn(void *userdata);
 
         void updateColumns();
-        void updateMaxContentWidth(LLScrollListItem* changed_item);
+        void calcMaxContentWidth(LLScrollListItem* changed_item);
+        S32 getMaxContentWidth() { return mMaxContentWidth; }
 
         void setDisplayHeading(BOOL display);
         void setHeadingHeight(S32 heading_height);
         void setCollapseEmptyColumns(BOOL collapse);
-        void setIsPopup(BOOL is_popup) { mIsPopup = is_popup; }
 
         LLScrollListItem*       hitItem(S32 x,S32 y);
         virtual void            scrollToShowSelected();
@@ -564,9 +591,11 @@ public:
         void setTotalStaticColumnWidth(int width) { mTotalStaticColumnWidth = width; }
 
         std::string     getSortColumnName();
-        BOOL                    getSortAscending() { return mSortAscending; }
+        BOOL                    getSortAscending() { return mSortColumns.empty() ? TRUE : mSortColumns.back().second; }
+        BOOL                    needsSorting();
 
         S32             selectMultiple( LLDynamicArray<LLUUID> ids );
+        void                    sortItems();
 
 protected:
         // "Full" interface: use this when you're creating a list that has one or more of the following:
@@ -584,7 +613,7 @@ protected:
         // to the caller to delete the item)
 
         // returns FALSE if item faile to be added to list, does NOT delete 'item'
-        BOOL                    addItem( LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM );
+        BOOL                    addItem( LLScrollListItem* item, EAddPosition pos = ADD_BOTTOM, BOOL requires_column = TRUE );
         void                    selectPrevItem(BOOL extend_selection);
         void                    selectNextItem(BOOL extend_selection);
         void                    drawItems();
@@ -596,6 +625,7 @@ protected:
         void                    deselectItem(LLScrollListItem* itemp);
         void                    commitIfChanged();
         void                    setSorted(BOOL sorted);
+        BOOL                    setSort(S32 column, BOOL ascending);
 
 protected:
         S32                             mCurIndex;                      // For get[First/Next]Data
@@ -615,8 +645,6 @@ protected:
         BOOL                    mNeedsScroll;
         BOOL                    mCanSelect;
         BOOL                    mDisplayColumnHeaders;
-        BOOL                    mCollapseEmptyColumns;
-        BOOL                    mIsPopup;
 
         typedef std::deque<LLScrollListItem *> item_list;
         item_list               mItemList;
@@ -626,7 +654,7 @@ protected:
         S32                             mMaxItemCount; 
 
         LLRect                  mItemListRect;
-
+        S32                             mMaxContentWidth;
         S32             mColumnPadding;
 
         BOOL                    mBackgroundVisible;
@@ -652,22 +680,23 @@ protected:
         LLWString               mSearchString;
         LLFrameTimer    mSearchTimer;
         
-        LLString                mDefaultColumn;
-
         S32                             mSearchColumn;
         S32                             mNumDynamicWidthColumns;
         S32                             mTotalStaticColumnWidth;
 
-        S32                             mSortColumn;
-        BOOL                    mSortAscending;
         BOOL                    mSorted;
-
+        
         std::map<LLString, LLScrollListColumn> mColumns;
-        std::vector<LLScrollListColumn*> mColumnsIndexed;
 
         BOOL                    mDirty;
         S32                             mOriginalSelection;
 
+        typedef std::vector<LLScrollListColumn*> ordered_columns_t;
+        ordered_columns_t       mColumnsIndexed;
+
+        typedef std::pair<S32, BOOL> sort_column_t;
+        std::vector<sort_column_t>      mSortColumns;
+
 public:
         // HACK:  Did we draw one selected item this frame?
         BOOL mDrewSelected;
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 606a8a1..e03603d 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -41,9 +41,6 @@
 #include "llcontrol.h"
 #include "llimagegl.h"
 
-const S32 THUMB_WIDTH = 8;
-const S32 TRACK_HEIGHT = 6;
-
 LLSlider::LLSlider( 
         const LLString& name,
         const LLRect& rect,
@@ -65,20 +62,24 @@ LLSlider::LLSlider(
         mIncrement( increment ),
         mVolumeSlider( volume ),
         mMouseOffset( 0 ),
-        mDragStartThumbRect( 0, mRect.getHeight(), THUMB_WIDTH, 0 ),
-        mThumbRect( 0, mRect.getHeight(), THUMB_WIDTH, 0 ),
         mTrackColor(            LLUI::sColorsGroup->getColor( "SliderTrackColor" ) ),
         mThumbOutlineColor(     LLUI::sColorsGroup->getColor( "SliderThumbOutlineColor" ) ),
         mThumbCenterColor(      LLUI::sColorsGroup->getColor( "SliderThumbCenterColor" ) ),
-        mDisabledThumbColor(LLUI::sColorsGroup->getColor( "SliderDisabledThumbColor" ) ),
         mMouseDownCallback( NULL ),
         mMouseUpCallback( NULL )
 {
+        mThumbImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("icn_slide-thumb_dark.tga")));
+        mTrackImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("icn_slide-groove_dark.tga")));
+        mTrackHighlightImage = LLUI::sImageProvider->getImageByID(LLUUID(LLUI::sAssetsGroup->getString("icn_slide-highlight.tga")));
+
         // properly handle setting the starting thumb rect
         // do it this way to handle both the operating-on-settings
         // and standalone ways of using this
         setControlName(control_name, NULL);
         setValue(getValueF32());
+
+        updateThumbRect();
+        mDragStartThumbRect = mThumbRect;
 }
 
 EWidgetType LLSlider::getWidgetType() const
@@ -107,17 +108,26 @@ void LLSlider::setValue(F32 value, BOOL from_event)
         }
 
         mValue = value;
+        updateThumbRect();
+}
 
+void LLSlider::updateThumbRect()
+{
         F32 t = (mValue - mMinValue) / (mMaxValue - mMinValue);
 
-        S32 left_edge = THUMB_WIDTH/2;
-        S32 right_edge = mRect.getWidth() - (THUMB_WIDTH/2);
+        S32 thumb_width = mThumbImage->getWidth();
+        S32 thumb_height = mThumbImage->getHeight();
+        S32 left_edge = (thumb_width / 2);
+        S32 right_edge = mRect.getWidth() - (thumb_width / 2);
 
         S32 x = left_edge + S32( t * (right_edge - left_edge) );
-        mThumbRect.mLeft = x - (THUMB_WIDTH/2);
-        mThumbRect.mRight = x + (THUMB_WIDTH/2);
+        mThumbRect.mLeft = x - (thumb_width / 2);
+        mThumbRect.mRight = mThumbRect.mLeft + thumb_width;
+        mThumbRect.mBottom = getLocalRect().getCenterY() - (thumb_height / 2);
+        mThumbRect.mTop = mThumbRect.mBottom + thumb_height;
 }
 
+
 void LLSlider::setValueAndCommit(F32 value)
 {
         F32 old_value = mValue;
@@ -139,8 +149,9 @@ BOOL LLSlider::handleHover(S32 x, S32 y, MASK mask)
 {
         if( hasMouseCapture() )
         {
-                S32 left_edge = THUMB_WIDTH/2;
-                S32 right_edge = mRect.getWidth() - (THUMB_WIDTH/2);
+                S32 thumb_half_width = mThumbImage->getWidth()/2;
+                S32 left_edge = thumb_half_width;
+                S32 right_edge = mRect.getWidth() - (thumb_half_width);
 
                 x += mMouseOffset;
                 x = llclamp( x, left_edge, right_edge );
@@ -203,7 +214,7 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask)
                 // Find the offset of the actual mouse location from the center of the thumb.
                 if (mThumbRect.pointInRect(x,y))
                 {
-                        mMouseOffset = (mThumbRect.mLeft + THUMB_WIDTH/2) - x;
+                        mMouseOffset = (mThumbRect.mLeft + mThumbImage->getWidth()/2) - x;
                 }
                 else
                 {
@@ -251,6 +262,9 @@ void LLSlider::draw()
 {
         if( getVisible() )
         {
+                // since thumb image might still be decoding, need thumb to accomodate image size
+                updateThumbRect();
+
                 // Draw background and thumb.
 
                 // drawing solids requires texturing be disabled
@@ -260,104 +274,37 @@ void LLSlider::draw()
 
                 F32 opacity = mEnabled ? 1.f : 0.3f;
                 LLColor4 center_color = (mThumbCenterColor % opacity);
-                LLColor4 outline_color = (mThumbOutlineColor % opacity);
                 LLColor4 track_color = (mTrackColor % opacity);
 
-                LLImageGL* thumb_imagep = NULL;
-                
                 // Track
-                if (mVolumeSlider)
-                {
-                        LLRect track(0, mRect.getHeight(), mRect.getWidth(), 0);
-
-                        track.mBottom += 3;
-                        track.mTop -= 1;
-                        track.mRight -= 1;
-
-                        gl_triangle_2d(track.mLeft, track.mBottom,
-                                                   track.mRight, track.mBottom,
-                                                   track.mRight, track.mTop,
-                                                   center_color,
-                                                   TRUE);
-                        gl_triangle_2d(track.mLeft, track.mBottom,
-                                                   track.mRight, track.mBottom,
-                                                   track.mRight, track.mTop,
-                                                   outline_color,
-                                                   FALSE);
-                }
-                else
-                {
-                        LLUUID thumb_image_id;
-                        thumb_image_id.set(LLUI::sAssetsGroup->getString("rounded_square.tga"));
-                        thumb_imagep = LLUI::sImageProvider->getUIImageByID(thumb_image_id);
+                LLRect track_rect(mThumbImage->getWidth() / 2, 
+                                                        getLocalRect().getCenterY() + (mTrackImage->getHeight() / 2), 
+                                                        mRect.getWidth() - mThumbImage->getWidth() / 2, 
+                                                        getLocalRect().getCenterY() - (mTrackImage->getHeight() / 2) );
 
-                        S32 height_offset = (mRect.getHeight() - TRACK_HEIGHT) / 2;
-                        LLRect track_rect(0, mRect.getHeight() - height_offset, mRect.getWidth(), height_offset );
+                gl_draw_scaled_image_with_border(track_rect.mLeft, track_rect.mBottom, 3, 3, track_rect.getWidth(), track_rect.getHeight(),
+                                                                                        mTrackImage, track_color);
+                gl_draw_scaled_image_with_border(track_rect.mLeft, track_rect.mBottom, 3, 3, mThumbRect.mLeft, track_rect.getHeight(),
+                                                                                        mTrackHighlightImage, track_color);
 
-                        track_rect.stretch(-1);
-                        gl_draw_scaled_image_with_border(track_rect.mLeft, track_rect.mBottom, 16, 16, track_rect.getWidth(), track_rect.getHeight(),
-                                                                                         thumb_imagep, track_color);
-                }
 
                 // Thumb
-                if (!thumb_imagep)
-                {
-                        if (mVolumeSlider)
-                        {
-                                if (hasMouseCapture())
-                                {
-                                        LLRect rect(mDragStartThumbRect);
-                                        gl_rect_2d( rect, outline_color );
-                                        rect.stretch(-1);
-                                        gl_rect_2d( rect, mThumbCenterColor % 0.3f );
-
-                                        if (hasFocus())
-                                        {
-                                                LLRect thumb_rect = mThumbRect;
-                                                thumb_rect.stretch(llround(lerp(1.f, 3.f, gFocusMgr.getFocusFlashAmt())));
-                                                gl_rect_2d(thumb_rect, gFocusMgr.getFocusColor());
-                                        }
-                                        gl_rect_2d( mThumbRect, mThumbOutlineColor );
-                                }
-                                else
-                                { 
-                                        if (hasFocus())
-                                        {
-                                                LLRect thumb_rect = mThumbRect;
-                                                thumb_rect.stretch(llround(lerp(1.f, 3.f, gFocusMgr.getFocusFlashAmt())));
-                                                gl_rect_2d(thumb_rect, gFocusMgr.getFocusColor());
-                                        }
-                                        LLRect rect(mThumbRect);
-                                        gl_rect_2d(rect, outline_color);
-                                        rect.stretch(-1);
-                                        gl_rect_2d( rect, center_color);
-                                }
-                        }
-                        else
-                        {
-                                gl_rect_2d(mThumbRect, mThumbCenterColor, TRUE);
-                                if (hasMouseCapture())
-                                {
-                                        gl_rect_2d(mDragStartThumbRect, center_color, FALSE);
-                                }
-                        }
-                }
-                else if( hasMouseCapture() )
+                if( hasMouseCapture() )
                 {
-                        gl_draw_scaled_image_with_border(mDragStartThumbRect.mLeft, mDragStartThumbRect.mBottom, 16, 16, mDragStartThumbRect.getWidth(), mDragStartThumbRect.getHeight(), 
-                                                                                         thumb_imagep, mThumbCenterColor % 0.3f, TRUE);
+                        gl_draw_scaled_image(mDragStartThumbRect.mLeft, mDragStartThumbRect.mBottom, mDragStartThumbRect.getWidth(), mDragStartThumbRect.getHeight(), 
+                                                                                         mThumbImage, mThumbCenterColor % 0.3f);
 
                         if (hasFocus())
                         {
                                 F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
                                 LLRect highlight_rect = mThumbRect;
                                 highlight_rect.stretch(llround(lerp(1.f, 3.f, lerp_amt)));
-                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 16, 16, highlight_rect.getWidth(), highlight_rect.getHeight(),
-                                                                                                 thumb_imagep, gFocusMgr.getFocusColor());
+                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 0, 0, highlight_rect.getWidth(), highlight_rect.getHeight(),
+                                                                                                 mThumbImage, gFocusMgr.getFocusColor(), TRUE);
                         }
 
-                        gl_draw_scaled_image_with_border(mThumbRect.mLeft, mThumbRect.mBottom, 16, 16, mThumbRect.getWidth(), mThumbRect.getHeight(), 
-                                                                                         thumb_imagep, mThumbOutlineColor, TRUE);
+                        gl_draw_scaled_image(mThumbRect.mLeft, mThumbRect.mBottom, mThumbRect.getWidth(), mThumbRect.getHeight(), 
+                                                                                         mThumbImage, mThumbOutlineColor);
 
                 }
                 else
@@ -367,12 +314,12 @@ void LLSlider::draw()
                                 F32 lerp_amt = gFocusMgr.getFocusFlashAmt();
                                 LLRect highlight_rect = mThumbRect;
                                 highlight_rect.stretch(llround(lerp(1.f, 3.f, lerp_amt)));
-                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 16, 16, highlight_rect.getWidth(), highlight_rect.getHeight(),
-                                                                                                 thumb_imagep, gFocusMgr.getFocusColor());
+                                gl_draw_scaled_image_with_border(highlight_rect.mLeft, highlight_rect.mBottom, 0, 0, highlight_rect.getWidth(), highlight_rect.getHeight(),
+                                                                                                 mThumbImage, gFocusMgr.getFocusColor(), TRUE);
                         }
 
-                        gl_draw_scaled_image_with_border(mThumbRect.mLeft, mThumbRect.mBottom, 16, 16, mThumbRect.getWidth(), mThumbRect.getHeight(), 
-                                                                                         thumb_imagep, center_color, TRUE);
+                        gl_draw_scaled_image(mThumbRect.mLeft, mThumbRect.mBottom, mThumbRect.getWidth(), mThumbRect.getHeight(), 
+                                                                                         mThumbImage, center_color);
                 }
                 LLUICtrl::draw();
         }
diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h
index 28a8d07..08ab600 100644
--- a/linden/indra/llui/llslider.h
+++ b/linden/indra/llui/llslider.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -36,6 +36,7 @@
 #include "v4color.h"
 
 class LLUICtrlFactory;
+class LLImageGL;
 
 class LLSlider : public LLUICtrl
 {
@@ -85,6 +86,7 @@ public:
 
 protected:
         void                    setValueAndCommit(F32 value);
+        void                    updateThumbRect();
 
 protected:
         F32                             mValue;
@@ -97,11 +99,14 @@ protected:
         S32                             mMouseOffset;
         LLRect                  mDragStartThumbRect;
 
+        LLImageGL*              mThumbImage;
+        LLImageGL*              mTrackImage;
+        LLImageGL*              mTrackHighlightImage;
+
         LLRect                  mThumbRect;
         LLColor4                mTrackColor;
         LLColor4                mThumbOutlineColor;
         LLColor4                mThumbCenterColor;
-        LLColor4                mDisabledThumbColor;
         
         void                    (*mMouseDownCallback)(LLUICtrl* ctrl, void* userdata);
         void                    (*mMouseUpCallback)(LLUICtrl* ctrl, void* userdata);
diff --git a/linden/indra/llui/llsliderctrl.cpp b/linden/indra/llui/llsliderctrl.cpp
index 8bb8e24..17854d0 100644
--- a/linden/indra/llui/llsliderctrl.cpp
+++ b/linden/indra/llui/llsliderctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -125,7 +125,7 @@ LLSliderCtrl::LLSliderCtrl(const LLString& name, const LLRect& rect,
                                 &LLLineEditor::prevalidateFloat );
                         mEditor->setFollowsLeft();
                         mEditor->setFollowsBottom();
-                        mEditor->setFocusReceivedCallback( &LLSliderCtrl::onEditorGainFocus );
+                        mEditor->setFocusReceivedCallback( &LLSliderCtrl::onEditorGainFocus, this );
                         mEditor->setIgnoreTab(TRUE);
                         // don't do this, as selecting the entire text is single clicking in some cases
                         // and double clicking in others
@@ -150,7 +150,7 @@ LLSliderCtrl::~LLSliderCtrl()
 }
 
 // static
-void LLSliderCtrl::onEditorGainFocus( LLUICtrl* caller, void *userdata )
+void LLSliderCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata )
 {
         LLSliderCtrl* self = (LLSliderCtrl*) userdata;
         llassert( caller == self->mEditor );
diff --git a/linden/indra/llui/llsliderctrl.h b/linden/indra/llui/llsliderctrl.h
index 87d2d89..7af0abf 100644
--- a/linden/indra/llui/llsliderctrl.h
+++ b/linden/indra/llui/llsliderctrl.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -117,7 +117,7 @@ public:
         static void             onSliderMouseUp(LLUICtrl* caller,void* userdata);
 
         static void             onEditorCommit(LLUICtrl* caller, void* userdata);
-        static void             onEditorGainFocus(LLUICtrl* caller, void *userdata);
+        static void             onEditorGainFocus(LLFocusableElement* caller, void *userdata);
         static void             onEditorChangeFocus(LLUICtrl* caller, S32 direction, void *userdata);
 
 private:
diff --git a/linden/indra/llui/llspinctrl.cpp b/linden/indra/llui/llspinctrl.cpp
index 0cd9390..4bd79e6 100644
--- a/linden/indra/llui/llspinctrl.cpp
+++ b/linden/indra/llui/llspinctrl.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -128,7 +128,7 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
                 &LLLineEditor::prevalidateFloat );
         mEditor->setFollowsLeft();
         mEditor->setFollowsBottom();
-        mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus );
+        mEditor->setFocusReceivedCallback( &LLSpinCtrl::onEditorGainFocus, this );
         //RN: this seems to be a BAD IDEA, as it makes the editor behavior different when it has focus
         // than when it doesn't.  Instead, if you always have to double click to select all the text, 
         // it's easier to understand
@@ -137,7 +137,7 @@ LLSpinCtrl::LLSpinCtrl(	const LLString& name, const LLRect& rect, const LLString
         addChild(mEditor);
 
         updateEditor();
-        setSpanChildren( TRUE );
+        setUseBoundingRect( TRUE );
 }
 
 LLSpinCtrl::~LLSpinCtrl()
@@ -230,7 +230,7 @@ void LLSpinCtrl::onDownBtn( void *userdata )
 }
 
 // static
-void LLSpinCtrl::onEditorGainFocus( LLUICtrl* caller, void *userdata )
+void LLSpinCtrl::onEditorGainFocus( LLFocusableElement* caller, void *userdata )
 {
         LLSpinCtrl* self = (LLSpinCtrl*) userdata;
         llassert( caller == self->mEditor );
diff --git a/linden/indra/llui/llspinctrl.h b/linden/indra/llui/llspinctrl.h
index de8513e..c5a36f5 100644
--- a/linden/indra/llui/llspinctrl.h
+++ b/linden/indra/llui/llspinctrl.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -113,7 +113,7 @@ public:
         virtual void    draw();
 
         static void             onEditorCommit(LLUICtrl* caller, void* userdata);
-        static void             onEditorGainFocus(LLUICtrl* caller, void *userdata);
+        static void             onEditorGainFocus(LLFocusableElement* caller, void *userdata);
         static void             onEditorChangeFocus(LLUICtrl* caller, S32 direction, void *userdata);
 
         static void             onUpBtn(void *userdata);
diff --git a/linden/indra/llui/llstyle.cpp b/linden/indra/llui/llstyle.cpp
index 2281d44..693e0be 100644
--- a/linden/indra/llui/llstyle.cpp
+++ b/linden/indra/llui/llstyle.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -230,7 +230,7 @@ void LLStyle::setImage(const LLString& src)
         }
         else
         {
-                mImagep = LLUI::sImageProvider->getUIImageByID(LLUUID(src));
+                mImagep = LLUI::sImageProvider->getImageByID(LLUUID(src));
         }
 }
 
diff --git a/linden/indra/llui/llstyle.h b/linden/indra/llui/llstyle.h
index fcff789..1712dc0 100644
--- a/linden/indra/llui/llstyle.h
+++ b/linden/indra/llui/llstyle.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 19dc6ec..0400b50 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -156,7 +156,12 @@ void LLTabContainerCommon::lockTabs(S32 num_tabs)
 {
         // count current tabs or use supplied value and ensure no new tabs get
         // inserted between them
-        mLockedTabCount = num_tabs > 0 ? num_tabs : getTabCount();
+        mLockedTabCount = num_tabs > 0 ? llmin(getTabCount(), num_tabs) : getTabCount();
+}
+
+void LLTabContainerCommon::unlockTabs()
+{
+        mLockedTabCount = 0;
 }
 
 void LLTabContainerCommon::removeTabPanel(LLPanel* child)
@@ -557,7 +562,7 @@ void LLTabContainerCommon::setTabImage(LLPanel* child, std::string img_name, con
 }
 
 void LLTabContainerCommon::setTitle(const LLString& title)
-{
+{       
         if (mTitleBox)
         {
                 mTitleBox->setText( title );
@@ -721,6 +726,14 @@ void LLTabContainerCommon::insertTuple(LLTabTuple * tuple, eInsertionPoint inser
                 // insert the new tab in the front of the list
                 mTabList.insert(mTabList.begin() + mLockedTabCount, tuple);
                 break;
+        case LEFT_OF_CURRENT:
+                // insert the new tab before the current tab (but not before mLockedTabCount)
+                {
+                tuple_list_t::iterator current_iter = mTabList.begin() + llmax(mLockedTabCount, mCurrentTabIdx);
+                mTabList.insert(current_iter, tuple);
+                }
+                break;
+
         case RIGHT_OF_CURRENT:
                 // insert the new tab after the current tab (but not before mLockedTabCount)
                 {
@@ -946,14 +959,14 @@ void LLTabContainer::addTabPanel(LLPanel* child,
         if( LLTabContainer::TOP == mTabPosition )
         {
                 btn_rect.setLeftTopAndSize( 0, mRect.getHeight() - mTopBorderHeight + tab_fudge, button_width, TABCNTR_TAB_HEIGHT );
-                tab_img = "UIImgBtnTabTopOutUUID";
-                tab_selected_img = "UIImgBtnTabTopInUUID";
+                tab_img = "tab_top_blue.tga";
+                tab_selected_img = "tab_top_selected_blue.tga";
         }
         else
         {
                 btn_rect.setOriginAndSize( 0, 0 + tab_fudge, button_width, TABCNTR_TAB_HEIGHT );
-                tab_img = "UIImgBtnTabBottomOutUUID";
-                tab_selected_img = "UIImgBtnTabBottomInUUID";
+                tab_img = "tab_bottom_blue.tga";
+                tab_selected_img = "tab_bottom_selected_blue.tga";
         }
 
         if (placeholder)
@@ -979,7 +992,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
                 LLButton* btn = new LLButton(
                         LLString(child->getName()) + " tab",
                         btn_rect, 
-                        tab_img, tab_selected_img, "",
+                        "", "", "",
                         &LLTabContainer::onTabBtn, NULL, // set userdata below
                         font,
                         trimmed_label, trimmed_label );
@@ -987,7 +1000,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
                 btn->setVisible( FALSE );
                 btn->setToolTip( tooltip );
                 btn->setScaleImage(TRUE);
-                btn->setFixedBorder(14, 14);
+                btn->setImages(tab_img, tab_selected_img);
 
                 // Try to squeeze in a bit more text
                 btn->setLeftHPad( 4 );
@@ -1139,7 +1152,7 @@ BOOL LLTabContainer::selectTab(S32 which)
 
         //if( gFocusMgr.childHasKeyboardFocus( this ) )
         //{
-        //      gFocusMgr.setKeyboardFocus( NULL, NULL );
+        //      gFocusMgr.setKeyboardFocus( NULL );
         //}
 
         LLTabTuple* selected_tuple = mTabList[which];
@@ -1370,7 +1383,7 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
                 {
                         LLButton* tab_button = mTabList[getCurrentPanelIndex()]->mButton;
                         gFocusMgr.setMouseCapture(this);
-                        gFocusMgr.setKeyboardFocus(tab_button, NULL);
+                        gFocusMgr.setKeyboardFocus(tab_button);
                 }
         }
         return handled;
@@ -1475,7 +1488,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
 BOOL LLTabContainer::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect )
 {
         BOOL handled = LLPanel::handleToolTip( x, y, msg, sticky_rect );
-        if (!handled && mTabList.size() > 0 && getVisible() && pointInView( x, y ) ) 
+        if (!handled && mTabList.size() > 0) 
         {
                 LLTabTuple* firsttuple = mTabList[0];
 
@@ -1645,12 +1658,12 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const L
                 mTotalTabWidth -= tuple->mButton->getRect().getWidth();
 
                 S32 image_overlay_width = tuple->mButton->getImageOverlay().notNull() ? 
-                        tuple->mButton->getImageOverlay()->getWidth(0) :
+                        tuple->mButton->getImageOverlay()->getImage()->getWidth(0) :
                         0;
 
                 tuple->mPadding = image_overlay_width;
 
-                tuple->mButton->setRightHPad(tuple->mPadding + LLBUTTON_H_PAD);
+                tuple->mButton->setRightHPad(6);
                 tuple->mButton->reshape(llclamp(fontp->getWidth(tuple->mButton->getLabelSelected()) + TAB_PADDING + tuple->mPadding, mMinTabWidth, mMaxTabWidth), 
                                                                 tuple->mButton->getRect().getHeight());
                 // add back in button width to total tab strip width
diff --git a/linden/indra/llui/lltabcontainer.h b/linden/indra/llui/lltabcontainer.h
index 3f2b1b4..e2770ee 100644
--- a/linden/indra/llui/lltabcontainer.h
+++ b/linden/indra/llui/lltabcontainer.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -54,6 +54,7 @@ public:
         {
                 START,
                 END,
+                LEFT_OF_CURRENT,
                 RIGHT_OF_CURRENT
         } eInsertionPoint;
 
@@ -91,6 +92,8 @@ public:
                                                          eInsertionPoint insertion_point = END) = 0;
         virtual void            addPlaceholder(LLPanel* child, const LLString& label);
         virtual void            lockTabs(S32 num_tabs = 0);
+        virtual void            unlockTabs();
+        S32                                     getNumLockedTabs() { return mLockedTabCount; }
 
         virtual void            enableTabButton(S32 which, BOOL enable);
 
diff --git a/linden/indra/llui/lltabcontainervertical.cpp b/linden/indra/llui/lltabcontainervertical.cpp
index 5a04417..334cb43 100644
--- a/linden/indra/llui/lltabcontainervertical.cpp
+++ b/linden/indra/llui/lltabcontainervertical.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -185,14 +185,14 @@ void LLTabContainerVertical::addTabPanel(LLPanel* child, const LLString& label,
         {
                 LLButton *btn = new LLButton("vert tab button",
                         btn_rect,
-                        "tab_left.tga",
-                        "tab_left_selected.tga", 
+                        "",
+                        "", 
                         "", 
                         &LLTabContainerVertical::onTabBtn, NULL,
                         font,
                         trimmed_label, trimmed_label);
                 btn->setSaveToXML(false);
-                btn->setFixedBorder(16, 16);
+                btn->setImages("tab_left.tga", "tab_left_selected.tga");
                 btn->setScaleImage(TRUE);
                 btn->setHAlign(LLFontGL::LEFT);
                 btn->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
@@ -306,7 +306,7 @@ BOOL LLTabContainerVertical::selectTab(S32 which)
 
         //if( gFocusMgr.childHasKeyboardFocus( this ) )
         //{
-        //      gFocusMgr.setKeyboardFocus( NULL, NULL );
+        //      gFocusMgr.setKeyboardFocus( NULL );
         //}
 
         LLTabTuple* selected_tuple = mTabList[which];
@@ -476,7 +476,7 @@ BOOL LLTabContainerVertical::handleMouseDown( S32 x, S32 y, MASK mask )
                 {
                         LLButton* tab_button = mTabList[getCurrentPanelIndex()]->mButton;
                         gFocusMgr.setMouseCapture(this);
-                        gFocusMgr.setKeyboardFocus(tab_button, NULL);
+                        gFocusMgr.setKeyboardFocus(tab_button);
                 }
         }
         return handled;
diff --git a/linden/indra/llui/lltabcontainervertical.h b/linden/indra/llui/lltabcontainervertical.h
index bfaf461..e887e53 100644
--- a/linden/indra/llui/lltabcontainervertical.h
+++ b/linden/indra/llui/lltabcontainervertical.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lltextbox.cpp b/linden/indra/llui/lltextbox.cpp
index d2dae30..1422e0a 100644
--- a/linden/indra/llui/lltextbox.cpp
+++ b/linden/indra/llui/lltextbox.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -56,6 +56,7 @@ LLTextBox::LLTextBox(const LLString& name, const LLRect& rect, const LLString& t
         mBorderVisible( FALSE ),
         mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
         mBorderDropShadowVisible( FALSE ),
+        mUseEllipses( FALSE ),
         mHPad(0),
         mVPad(0),
         mHAlign( LLFontGL::LEFT ),
@@ -84,6 +85,7 @@ LLTextBox::LLTextBox(const LLString& name, const LLString& text, F32 max_width,
         mBorderVisible(FALSE),
         mFontStyle(LLFontGL::DROP_SHADOW_SOFT),
         mBorderDropShadowVisible(FALSE),
+        mUseEllipses( FALSE ),
         mHPad(0),
         mVPad(0),
         mHAlign(LLFontGL::LEFT),
@@ -174,7 +176,7 @@ BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask)
                 mHasHover = TRUE; // This should be set every frame during a hover.
                 return TRUE;
         }
-        return FALSE;
+        return LLView::handleHover(x,y,mask);
 }
 
 void LLTextBox::setText(const LLStringExplicit& text)
@@ -393,7 +395,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
                         mFontGL->render(mText.getWString(), cur_pos, (F32)x, (F32)y, color,
                                                         mHAlign, mVAlign,
                                                         mFontStyle,
-                                                        line_length, mRect.getWidth(), NULL, TRUE );
+                                                        line_length, mRect.getWidth(), NULL, TRUE, mUseEllipses );
                         cur_pos += line_length + 1;
                         y -= llfloor(mFontGL->getLineHeight());
                 }
@@ -403,7 +405,7 @@ void LLTextBox::drawText( S32 x, S32 y, const LLColor4& color )
                 mFontGL->render(mText.getWString(), 0, (F32)x, (F32)y, color,
                                                 mHAlign, mVAlign, 
                                                 mFontStyle,
-                                                S32_MAX, mRect.getWidth(), NULL, TRUE);
+                                                S32_MAX, mRect.getWidth(), NULL, TRUE, mUseEllipses);
         }
 }
 
@@ -481,7 +483,7 @@ LLView* LLTextBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *f
                 text_box->mFontStyle = LLFontGL::getStyleFromString(font_style);
         }
         
-        BOOL mouse_opaque;
+        BOOL mouse_opaque = text_box->getMouseOpaque();
         if (node->getAttributeBOOL("mouse_opaque", mouse_opaque))
         {
                 text_box->setMouseOpaque(mouse_opaque);
diff --git a/linden/indra/llui/lltextbox.h b/linden/indra/llui/lltextbox.h
index bdcccf7..c8bdfc5 100644
--- a/linden/indra/llui/lltextbox.h
+++ b/linden/indra/llui/lltextbox.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -79,6 +79,7 @@ public:
         void                    setText( const LLStringExplicit& text );
         void                    setWrappedText(const LLStringExplicit& text, F32 max_width = -1.0);
                                                 // default width means use existing control width
+        void                    setUseEllipses( BOOL use_ellipses )             { mUseEllipses = use_ellipses; }
         
         void                    setBackgroundVisible(BOOL visible)              { mBackgroundVisible = visible; }
         void                    setBorderVisible(BOOL visible)                  { mBorderVisible = visible; }
@@ -124,6 +125,7 @@ protected:
         
         U8                              mFontStyle; // style bit flags for font
         BOOL                    mBorderDropShadowVisible;
+        BOOL                    mUseEllipses;
 
         S32                             mHPad;
         S32                             mVPad;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index b4d693b..ca9ea0a 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -79,6 +79,15 @@ const F32	CURSOR_FLASH_DELAY = 1.0f;  // in seconds
 const S32       CURSOR_THICKNESS = 2;
 const S32       SPACES_PER_TAB = 4;
 
+const F32       PREEDIT_MARKER_BRIGHTNESS = 0.4f;
+const S32       PREEDIT_MARKER_GAP = 1;
+const S32       PREEDIT_MARKER_POSITION = 2;
+const S32       PREEDIT_MARKER_THICKNESS = 1;
+const F32       PREEDIT_STANDOUT_BRIGHTNESS = 0.6f;
+const S32       PREEDIT_STANDOUT_GAP = 1;
+const S32       PREEDIT_STANDOUT_POSITION = 2;
+const S32       PREEDIT_STANDOUT_THICKNESS = 2;
+
 LLColor4 LLTextEditor::mLinkColor = LLColor4::blue;
 void (* LLTextEditor::mURLcallback)(const char*)              = NULL;
 bool (* LLTextEditor::mSecondlifeURLcallback)(const std::string&)   = NULL;
@@ -274,14 +283,14 @@ private:
 LLTextEditor::LLTextEditor(     
         const LLString& name, 
         const LLRect& rect, 
-        S32 max_length, 
+        S32 max_length,                                         // In bytes
         const LLString &default_text, 
         const LLFontGL* font,
         BOOL allow_embedded_items)
         :       
         LLUICtrl( name, rect, TRUE, NULL, NULL, FOLLOWS_TOP | FOLLOWS_LEFT ),
         mTextIsUpToDate(TRUE),
-        mMaxTextLength( max_length ),
+        mMaxTextByteLength( max_length ),
         mBaseDocIsPristine(TRUE),
         mPristineCmd( NULL ),
         mLastCmd( NULL ),
@@ -293,6 +302,7 @@ LLTextEditor::LLTextEditor(
         mOnScrollEndData( NULL ),
         mCursorColor(           LLUI::sColorsGroup->getColor( "TextCursorColor" ) ),
         mFgColor(                       LLUI::sColorsGroup->getColor( "TextFgColor" ) ),
+        mDefaultColor(          LLUI::sColorsGroup->getColor( "TextDefaultColor" ) ),
         mReadOnlyFgColor(       LLUI::sColorsGroup->getColor( "TextFgReadOnlyColor" ) ),
         mWriteableBgColor(      LLUI::sColorsGroup->getColor( "TextBgWriteableColor" ) ),
         mReadOnlyBgColor(       LLUI::sColorsGroup->getColor( "TextBgReadOnlyColor" ) ),
@@ -301,9 +311,9 @@ LLTextEditor::LLTextEditor(
         mWordWrap( FALSE ),
         mTabToNextField( TRUE ),
         mCommitOnFocusLost( FALSE ),
-        mTakesFocus( TRUE ),
         mHideScrollbarForShortDocs( FALSE ),
         mTakesNonScrollClicks( TRUE ),
+        mTrackBottom( TRUE ),
         mAllowEmbeddedItems( allow_embedded_items ),
         mAcceptCallingCardNames(FALSE),
         mHandleEditKeysDirectly( FALSE ),
@@ -510,13 +520,27 @@ BOOL LLTextEditor::isPartOfWord(llwchar c) { return (c == '_') || isalnum(c); }
 
 
 
-void LLTextEditor::truncate()
+BOOL LLTextEditor::truncate()
 {
-        if (mWText.size() > (size_t)mMaxTextLength)
-        {
-                LLWString::truncate(mWText, mMaxTextLength);
-                mTextIsUpToDate = FALSE;
+        BOOL did_truncate = FALSE;
+
+        // First rough check - if we're less than 1/4th the size, we're OK
+        if (mWText.size() >= (size_t) (mMaxTextByteLength / 4))
+        {       
+                // Have to check actual byte size
+                S32 utf8_byte_size = wstring_utf8_length( mWText );
+                if ( utf8_byte_size > mMaxTextByteLength )
+                {
+                        // Truncate safely in UTF-8
+                        std::string temp_utf8_text = wstring_to_utf8str( mWText );
+                        temp_utf8_text = utf8str_truncate( temp_utf8_text, mMaxTextByteLength );
+                        mWText = utf8str_to_wstring( temp_utf8_text );
+                        mTextIsUpToDate = FALSE;
+                        did_truncate = TRUE;
+                }
         }
+
+        return did_truncate;
 }
 
 void LLTextEditor::setText(const LLStringExplicit &utf8str)
@@ -750,12 +774,12 @@ S32 LLTextEditor::nextWordPos(S32 cursorPos) const
         return cursorPos;
 }
 
-S32 LLTextEditor::getLineCount()
+S32 LLTextEditor::getLineCount() const
 {
         return mLineStartList.size();
 }
 
-S32 LLTextEditor::getLineStart( S32 line )
+S32 LLTextEditor::getLineStart( S32 line ) const
 {
         S32 num_lines = getLineCount();
         if (num_lines == 0)
@@ -1118,46 +1142,42 @@ void LLTextEditor::selectAll()
 
 BOOL LLTextEditor::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_screen)
 {
-        if (pointInView(x, y) && getVisible())
+        for ( child_list_const_iter_t child_it = getChildList()->begin();
+                        child_it != getChildList()->end(); ++child_it)
         {
-                for ( child_list_const_iter_t child_it = getChildList()->begin();
-                          child_it != getChildList()->end(); ++child_it)
-                {
-                        LLView* viewp = *child_it;
-                        S32 local_x = x - viewp->getRect().mLeft;
-                        S32 local_y = y - viewp->getRect().mBottom;
-                        if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
-                        {
-                                return TRUE;
-                        }
-                }
-
-                if( mSegments.empty() )
+                LLView* viewp = *child_it;
+                S32 local_x = x - viewp->getRect().mLeft;
+                S32 local_y = y - viewp->getRect().mBottom;
+                if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
                 {
                         return TRUE;
                 }
+        }
 
-                LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
-                if( cur_segment )
-                {
-                        BOOL has_tool_tip = FALSE;
-                        has_tool_tip = cur_segment->getToolTip( msg );
+        if( mSegments.empty() )
+        {
+                return TRUE;
+        }
 
-                        if( has_tool_tip )
-                        {
-                                // Just use a slop area around the cursor
-                                // Convert rect local to screen coordinates
-                                S32 SLOP = 8;
-                                localPointToScreen( 
-                                        x - SLOP, y - SLOP, 
-                                        &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
-                                sticky_rect_screen->mRight = sticky_rect_screen->mLeft + 2 * SLOP;
-                                sticky_rect_screen->mTop = sticky_rect_screen->mBottom + 2 * SLOP;
-                        }
+        LLTextSegment* cur_segment = getSegmentAtLocalPos( x, y );
+        if( cur_segment )
+        {
+                BOOL has_tool_tip = FALSE;
+                has_tool_tip = cur_segment->getToolTip( msg );
+
+                if( has_tool_tip )
+                {
+                        // Just use a slop area around the cursor
+                        // Convert rect local to screen coordinates
+                        S32 SLOP = 8;
+                        localPointToScreen( 
+                                x - SLOP, y - SLOP, 
+                                &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+                        sticky_rect_screen->mRight = sticky_rect_screen->mLeft + 2 * SLOP;
+                        sticky_rect_screen->mTop = sticky_rect_screen->mBottom + 2 * SLOP;
                 }
-                return TRUE;
         }
-        return FALSE;
+        return TRUE;
 }
 
 BOOL LLTextEditor::handleScrollWheel(S32 x, S32 y, S32 clicks)
@@ -1240,7 +1260,7 @@ BOOL LLTextEditor::handleMouseDown(S32 x, S32 y, MASK mask)
                 handled = TRUE;
         }
 
-        if (mTakesFocus)
+        if (hasTabStop())
         {
                 setFocus( TRUE );
                 handled = TRUE;
@@ -1413,11 +1433,6 @@ BOOL LLTextEditor::handleDoubleClick(S32 x, S32 y, MASK mask)
 
         if( !handled && mTakesNonScrollClicks)
         {
-                if (mTakesFocus)
-                {
-                        setFocus( TRUE );
-                }
-                
                 setCursorAtLocalPos( x, y, FALSE );
                 deselect();
 
@@ -1604,7 +1619,7 @@ void LLTextEditor::removeChar()
 // Add a single character to the text
 S32 LLTextEditor::addChar(S32 pos, llwchar wc)
 {
-        if ((S32)mWText.length() == mMaxTextLength)
+        if ( (wstring_utf8_length( mWText ) + wchar_utf8_length( wc ))  >= mMaxTextByteLength)
         {
                 make_ui_sound("UISndBadKeystroke");
                 return 0;
@@ -2490,11 +2505,16 @@ void LLTextEditor::redo()
         }
 }
 
+void LLTextEditor::onFocusReceived()
+{
+        LLUICtrl::onFocusReceived();
+        updateAllowingLanguageInput();
+}
 
 // virtual, from LLView
 void LLTextEditor::onFocusLost()
 {
-        getWindow()->allowLanguageTextInput(FALSE);
+        updateAllowingLanguageInput();
 
         // Route menu back to the default
         if( gEditMenuHandler == this )
@@ -2521,6 +2541,7 @@ void LLTextEditor::setEnabled(BOOL enabled)
         {
                 mReadOnly = read_only;
                 updateSegments();
+                updateAllowingLanguageInput();
         }
 }
 
@@ -2825,6 +2846,100 @@ void LLTextEditor::drawCursor()
         }
 }
 
+void LLTextEditor::drawPreeditMarker()
+{
+        if (!hasPreeditString())
+        {
+                return;
+        }
+
+        const llwchar *text = mWText.c_str();
+        const S32 text_len = getLength();
+        const S32 num_lines = getLineCount();
+
+        S32 cur_line = mScrollbar->getDocPos();
+        if (cur_line >= num_lines)
+        {
+                return;
+        }
+                
+        const S32 line_height = llround( mGLFont->getLineHeight() );
+
+        S32 line_start = getLineStart(cur_line);
+        S32 line_y = mTextRect.mTop - line_height;
+        while((mTextRect.mBottom <= line_y) && (num_lines > cur_line))
+        {
+                S32 next_start = -1;
+                S32 line_end = text_len;
+
+                if ((cur_line + 1) < num_lines)
+                {
+                        next_start = getLineStart(cur_line + 1);
+                        line_end = next_start;
+                }
+                if ( text[line_end-1] == '\n' )
+                {
+                        --line_end;
+                }
+
+                // Does this line contain preedits?
+                if (line_start >= mPreeditPositions.back())
+                {
+                        // We have passed the preedits.
+                        break;
+                }
+                if (line_end > mPreeditPositions.front())
+                {
+                        for (U32 i = 0; i < mPreeditStandouts.size(); i++)
+                        {
+                                S32 left = mPreeditPositions[i];
+                                S32 right = mPreeditPositions[i + 1];
+                                if (right <= line_start || left >= line_end)
+                                {
+                                        continue;
+                                }
+
+                                S32 preedit_left = mTextRect.mLeft;
+                                if (left > line_start)
+                                {
+                                        preedit_left += mGLFont->getWidth(text, line_start, left - line_start, mAllowEmbeddedItems);
+                                }
+                                S32 preedit_right = mTextRect.mLeft;
+                                if (right < line_end)
+                                {
+                                        preedit_right += mGLFont->getWidth(text, line_start, right - line_start, mAllowEmbeddedItems);
+                                }
+                                else
+                                {
+                                        preedit_right += mGLFont->getWidth(text, line_start, line_end - line_start, mAllowEmbeddedItems);
+                                }
+
+                                if (mPreeditStandouts[i])
+                                {
+                                        gl_rect_2d(preedit_left + PREEDIT_STANDOUT_GAP,
+                                                        line_y + PREEDIT_STANDOUT_POSITION,
+                                                        preedit_right - PREEDIT_STANDOUT_GAP - 1,
+                                                        line_y + PREEDIT_STANDOUT_POSITION - PREEDIT_STANDOUT_THICKNESS,
+                                                        (mCursorColor * PREEDIT_STANDOUT_BRIGHTNESS + mWriteableBgColor * (1 - PREEDIT_STANDOUT_BRIGHTNESS)).setAlpha(1.0f));
+                                }
+                                else
+                                {
+                                        gl_rect_2d(preedit_left + PREEDIT_MARKER_GAP,
+                                                        line_y + PREEDIT_MARKER_POSITION,
+                                                        preedit_right - PREEDIT_MARKER_GAP - 1,
+                                                        line_y + PREEDIT_MARKER_POSITION - PREEDIT_MARKER_THICKNESS,
+                                                        (mCursorColor * PREEDIT_MARKER_BRIGHTNESS + mWriteableBgColor * (1 - PREEDIT_MARKER_BRIGHTNESS)).setAlpha(1.0f));
+                                }
+                        }
+                }
+
+                // move down one line
+                line_y -= line_height;
+                line_start = next_start;
+                cur_line++;
+        }
+}
+
 
 void LLTextEditor::drawText()
 {
@@ -3025,6 +3140,7 @@ void LLTextEditor::draw()
 
                         drawBackground();
                         drawSelectionBackground();
+                        drawPreeditMarker();
                         drawText();
                         drawCursor();
 
@@ -3036,6 +3152,9 @@ void LLTextEditor::draw()
                 }
                 LLView::draw();  // Draw children (scrollbar and border)
         }
+        
+        // remember if we are supposed to be at the bottom of the buffer
+        mScrolledToBottom = isScrolledToBottom();
 }
 
 void LLTextEditor::reportBadKeystroke()
@@ -3067,10 +3186,10 @@ void LLTextEditor::setFocus( BOOL new_state )
         // Don't change anything if the focus state didn't change
         if (new_state == old_state) return;
 
-        // Notify early if we are loosing focus.
+        // Notify early if we are losing focus.
         if (!new_state)
         {
-                getWindow()->allowLanguageTextInput(FALSE);
+                getWindow()->allowLanguageTextInput(this, FALSE);
         }
 
         LLUICtrl::setFocus( new_state );
@@ -3093,12 +3212,6 @@ void LLTextEditor::setFocus( BOOL new_state )
 
                 endSelection();
         }
-
-        // Notify late if we are gaining focus.
-        if (new_state && !mReadOnly)
-        {
-                getWindow()->allowLanguageTextInput(TRUE);
-        }
 }
 
 BOOL LLTextEditor::acceptsTextInput() const
@@ -3210,6 +3323,17 @@ void LLTextEditor::changeLine( S32 delta )
         unbindEmbeddedChars( mGLFont );
 }
 
+BOOL LLTextEditor::isScrolledToTop() 
+{ 
+        return mScrollbar->isAtBeginning(); 
+}
+
+BOOL LLTextEditor::isScrolledToBottom() 
+{ 
+        return mScrollbar->isAtEnd(); 
+}
+
+
 void LLTextEditor::startOfLine()
 {
         S32 line, offset;
@@ -3330,6 +3454,13 @@ void LLTextEditor::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
         LLView::reshape( width, height, called_from_parent );
 
+        // if scrolled to bottom, stay at bottom
+        // unless user is editing text
+        if (mScrolledToBottom && mTrackBottom && !hasFocus())
+        {
+                endOfDoc();
+        }
+
         updateTextRect();
 
         S32 line_height = llround( mGLFont->getLineHeight() );
@@ -3540,22 +3671,20 @@ void LLTextEditor::removeTextFromEnd(S32 num_chars)
 
 S32 LLTextEditor::insertStringNoUndo(const S32 pos, const LLWString &wstr)
 {
-        S32 len = mWText.length();
-        S32 s_len = wstr.length();
-        S32 new_len = len + s_len;
-        if( new_len > mMaxTextLength )
-        {
-                new_len = mMaxTextLength;
+        S32 old_len = mWText.length();          // length() returns character length
+        S32 insert_len = wstr.length();
+
+        mWText.insert(pos, wstr);
+        mTextIsUpToDate = FALSE;
 
+        if ( truncate() )
+        {
                 // The user's not getting everything he's hoping for
                 make_ui_sound("UISndBadKeystroke");
+                insert_len = mWText.length() - old_len;
         }
 
-        mWText.insert(pos, wstr);
-        mTextIsUpToDate = FALSE;
-        truncate();
-
-        return new_len - len;
+        return insert_len;
 }
 
 S32 LLTextEditor::removeStringNoUndo(S32 pos, S32 length)
@@ -3671,7 +3800,7 @@ void LLTextEditor::loadKeywords(const LLString& filename,
                         mKeywords.addToken(LLKeywordToken::WORD, name.c_str(), color, tooltips.get(i) );
                 }
 
-                mKeywords.findSegments( &mSegments, mWText );
+                mKeywords.findSegments( &mSegments, mWText, mDefaultColor );
 
                 llassert( mSegments.front()->getStart() == 0 );
                 llassert( mSegments.back()->getEnd() == getLength() );
@@ -3683,7 +3812,7 @@ void LLTextEditor::updateSegments()
         if (mKeywords.isLoaded())
         {
                 // HACK:  No non-ascii keywords for now
-                mKeywords.findSegments(&mSegments, mWText);
+                mKeywords.findSegments(&mSegments, mWText, mDefaultColor);
         }
         else if (mAllowEmbeddedItems)
         {
@@ -3920,7 +4049,7 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer )
                 return FALSE;
         }
 
-        if( text_len > mMaxTextLength )
+        if( text_len > mMaxTextByteLength )
         {
                 llwarns << "Invalid Linden text length: " << text_len << llendl;
                 return FALSE;
@@ -4064,6 +4193,7 @@ LLXMLNodePtr LLTextEditor::getXML(bool save_children) const
 
         addColorXML(node, mCursorColor, "cursor_color", "TextCursorColor");
         addColorXML(node, mFgColor, "text_color", "TextFgColor");
+        addColorXML(node, mDefaultColor, "text_default_color", "TextDefaultColor");
         addColorXML(node, mReadOnlyFgColor, "text_readonly_color", "TextFgReadOnlyColor");
         addColorXML(node, mReadOnlyBgColor, "bg_readonly_color", "TextBgReadOnlyColor");
         addColorXML(node, mWriteableBgColor, "bg_writeable_color", "TextBgWriteableColor");
@@ -4118,6 +4248,8 @@ void LLTextEditor::setTextEditorParameters(LLXMLNodePtr node)
         node->getAttributeBOOL("word_wrap", word_wrap);
         setWordWrap(word_wrap);
 
+        node->getAttributeBOOL("track_bottom", mTrackBottom);
+
         LLColor4 color;
         if (LLUICtrlFactory::getAttributeColor(node,"cursor_color", color)) 
         {
@@ -4281,3 +4413,262 @@ BOOL LLTextEditor::findHTML(const LLString &line, S32 *begin, S32 *end)
         }
         return matched;
 }
+
+
+
+void LLTextEditor::updateAllowingLanguageInput()
+{
+        if (hasFocus() && !mReadOnly)
+        {
+                getWindow()->allowLanguageTextInput(this, TRUE);
+        }
+        else
+        {
+                getWindow()->allowLanguageTextInput(this, FALSE);
+        }
+}
+
+// Preedit is managed off the undo/redo command stack.
+
+BOOL LLTextEditor::hasPreeditString() const
+{
+        return (mPreeditPositions.size() > 1);
+}
+
+void LLTextEditor::resetPreedit()
+{
+        if (hasPreeditString())
+        {
+                mCursorPos = mPreeditPositions.front();
+                removeStringNoUndo(mCursorPos, mPreeditPositions.back() - mCursorPos);
+                insertStringNoUndo(mCursorPos, mPreeditOverwrittenWString);
+
+                mPreeditWString.clear();
+                mPreeditOverwrittenWString.clear();
+                mPreeditPositions.clear();
+
+                updateLineStartList();
+                setCursorPos(mCursorPos);
+                // updateScrollFromCursor();
+        }
+}
+
+void LLTextEditor::updatePreedit(const LLWString &preedit_string,
+                const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position)
+{
+        // Just in case.
+        if (mReadOnly)
+        {
+                return;
+        }
+
+        if (hasSelection())
+        {
+                if (hasPreeditString())
+                {
+                        llwarns << "Preedit and selection!" << llendl;
+                        deselect();
+                }
+                else
+                {
+                        deleteSelection(TRUE);
+                }
+        }
+
+        getWindow()->hideCursorUntilMouseMove();
+
+        S32 insert_preedit_at = mCursorPos;
+        if (hasPreeditString())
+        {
+                insert_preedit_at = mPreeditPositions.front();
+                removeStringNoUndo(insert_preedit_at, mPreeditPositions.back() - insert_preedit_at);
+                insertStringNoUndo(insert_preedit_at, mPreeditOverwrittenWString);
+        }
+
+        mPreeditWString = preedit_string;
+        mPreeditPositions.resize(preedit_segment_lengths.size() + 1);
+        S32 position = insert_preedit_at;
+        for (segment_lengths_t::size_type i = 0; i < preedit_segment_lengths.size(); i++)
+        {
+                mPreeditPositions[i] = position;
+                position += preedit_segment_lengths[i];
+        }
+        mPreeditPositions.back() = position;
+
+        if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode())
+        {
+                mPreeditOverwrittenWString = getWSubString(insert_preedit_at, mPreeditWString.length());
+                removeStringNoUndo(insert_preedit_at, mPreeditWString.length());
+        }
+        else
+        {
+                mPreeditOverwrittenWString.clear();
+        }
+        insertStringNoUndo(insert_preedit_at, mPreeditWString);
+
+        mPreeditStandouts = preedit_standouts;
+
+        updateLineStartList();
+        setCursorPos(insert_preedit_at + caret_position);
+        // updateScrollFromCursor();
+
+        // Update of the preedit should be caused by some key strokes.
+        mKeystrokeTimer.reset();
+}
+
+BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect *bounds, LLRect *control) const
+{
+        if (control)
+        {
+                LLRect control_rect_screen;
+                localRectToScreen(mTextRect, &control_rect_screen);
+                LLUI::screenRectToGL(control_rect_screen, control);
+        }
+
+        S32 preedit_left_position, preedit_right_position;
+        if (hasPreeditString())
+        {
+                preedit_left_position = mPreeditPositions.front();
+                preedit_right_position = mPreeditPositions.back();
+        }
+        else
+        {
+                preedit_left_position = preedit_right_position = mCursorPos;
+        }
+
+        const S32 query = (query_offset >= 0 ? preedit_left_position + query_offset : mCursorPos);
+        if (query < preedit_left_position || query > preedit_right_position)
+        {
+                return FALSE;
+        }
+
+        const S32 first_visible_line = mScrollbar->getDocPos();
+        if (query < getLineStart(first_visible_line))
+        {
+                return FALSE;
+        }
+
+        S32 current_line = first_visible_line;
+        S32 current_line_start, current_line_end;
+        for (;;)
+        {
+                current_line_start = getLineStart(current_line);
+                current_line_end = getLineStart(current_line + 1);
+                if (query >= current_line_start && query < current_line_end)
+                {
+                        break;
+                }
+                if (current_line_start == current_line_end)
+                {
+                        // We have reached on the last line.  The query position must be here.
+                        break;
+                }
+                current_line++;
+        }
+
+        const llwchar * const text = mWText.c_str();
+        const S32 line_height = llround(mGLFont->getLineHeight());
+
+        if (coord)
+        {
+                const S32 query_x = mTextRect.mLeft + mGLFont->getWidth(text, current_line_start, query - current_line_start, mAllowEmbeddedItems);
+                const S32 query_y = mTextRect.mTop - (current_line - first_visible_line) * line_height - line_height / 2;
+                S32 query_screen_x, query_screen_y;
+                localPointToScreen(query_x, query_y, &query_screen_x, &query_screen_y);
+                LLUI::screenPointToGL(query_screen_x, query_screen_y, &coord->mX, &coord->mY);
+        }
+
+        if (bounds)
+        {
+                S32 preedit_left = mTextRect.mLeft;
+                if (preedit_left_position > current_line_start)
+                {
+                        preedit_left += mGLFont->getWidth(text, current_line_start, preedit_left_position - current_line_start, mAllowEmbeddedItems);
+                }
+
+                S32 preedit_right = mTextRect.mLeft;
+                if (preedit_right_position < current_line_end)
+                {
+                        preedit_right += mGLFont->getWidth(text, current_line_start, preedit_right_position - current_line_start, mAllowEmbeddedItems);
+                }
+                else
+                {
+                        preedit_right += mGLFont->getWidth(text, current_line_start, current_line_end - current_line_start, mAllowEmbeddedItems);
+                }
+
+                const S32 preedit_top = mTextRect.mTop - (current_line - first_visible_line) * line_height;
+                const S32 preedit_bottom = preedit_top - line_height;
+
+                const LLRect preedit_rect_local(preedit_left, preedit_top, preedit_right, preedit_bottom);
+                LLRect preedit_rect_screen;
+                localRectToScreen(preedit_rect_local, &preedit_rect_screen);
+                LLUI::screenRectToGL(preedit_rect_screen, bounds);
+        }
+
+        return TRUE;
+}
+
+void LLTextEditor::getSelectionRange(S32 *position, S32 *length) const
+{
+        if (hasSelection())
+        {
+                *position = llmin(mSelectionStart, mSelectionEnd);
+                *length = llabs(mSelectionStart - mSelectionEnd);
+        }
+        else
+        {
+                *position = mCursorPos;
+                *length = 0;
+        }
+}
+
+void LLTextEditor::getPreeditRange(S32 *position, S32 *length) const
+{
+        if (hasPreeditString())
+        {
+                *position = mPreeditPositions.front();
+                *length = mPreeditPositions.back() - mPreeditPositions.front();
+        }
+        else
+        {
+                *position = mCursorPos;
+                *length = 0;
+        }
+}
+
+void LLTextEditor::markAsPreedit(S32 position, S32 length)
+{
+        deselect();
+        setCursorPos(position);
+        if (hasPreeditString())
+        {
+                llwarns << "markAsPreedit invoked when hasPreeditString is true." << llendl;
+        }
+        mPreeditWString = LLWString( mWText, position, length );
+        if (length > 0)
+        {
+                mPreeditPositions.resize(2);
+                mPreeditPositions[0] = position;
+                mPreeditPositions[1] = position + length;
+                mPreeditStandouts.resize(1);
+                mPreeditStandouts[0] = FALSE;
+        }
+        else
+        {
+                mPreeditPositions.clear();
+                mPreeditStandouts.clear();
+        }
+        if (LL_KIM_OVERWRITE == gKeyboard->getInsertMode())
+        {
+                mPreeditOverwrittenWString = mPreeditWString;
+        }
+        else
+        {
+                mPreeditOverwrittenWString.clear();
+        }
+}
+
+S32 LLTextEditor::getPreeditFontSize() const
+{
+        return llround(mGLFont->getLineHeight() * LLUI::sGLScaleFactor.mV[VY]);
+}
diff --git a/linden/indra/llui/lltexteditor.h b/linden/indra/llui/lltexteditor.h
index 33ec1c6..4c92297 100644
--- a/linden/indra/llui/lltexteditor.h
+++ b/linden/indra/llui/lltexteditor.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -43,6 +43,8 @@
 #include "lleditmenuhandler.h"
 #include "lldarray.h"
 
+#include "llpreeditor.h"
+
 class LLFontGL;
 class LLScrollbar;
 class LLViewBorder;
@@ -64,7 +66,7 @@ const S32 MAX_EMBEDDED_ITEMS = LAST_EMBEDDED_CHAR - FIRST_EMBEDDED_CHAR + 1;
 class LLTextSegment;
 class LLTextCmd;
 
-class LLTextEditor : public LLUICtrl, LLEditMenuHandler
+class LLTextEditor : public LLUICtrl, LLEditMenuHandler, protected LLPreeditor
 {
         friend class LLTextCmd;
 public:
@@ -104,6 +106,7 @@ public:
         // view overrides
         virtual void    reshape(S32 width, S32 height, BOOL called_from_parent);
         virtual void    draw();
+        virtual void    onFocusReceived();
         virtual void    onFocusLost();
         virtual void    setEnabled(BOOL enabled);
 
@@ -184,6 +187,7 @@ public:
 
         void                    setCursorColor(const LLColor4& c)                       { mCursorColor = c; }
         void                    setFgColor( const LLColor4& c )                         { mFgColor = c; }
+        void                    setTextDefaultColor( const LLColor4& c )                                { mDefaultColor = c; }
         void                    setReadOnlyFgColor( const LLColor4& c )         { mReadOnlyFgColor = c; }
         void                    setWriteableBgColor( const LLColor4& c )        { mWriteableBgColor = c; }
         void                    setReadOnlyBgColor( const LLColor4& c )         { mReadOnlyBgColor = c; }
@@ -203,13 +207,13 @@ public:
         void                    setTabToNextField(BOOL b)                               { mTabToNextField = b; }
         void                    setCommitOnFocusLost(BOOL b)                    { mCommitOnFocusLost = b; }
 
-        // If takes focus, will take keyboard focus on click.
-        void                    setTakesFocus(BOOL b)                                   { mTakesFocus = b; }
-
         // Hack to handle Notecards
         virtual BOOL    importBuffer(const LLString& buffer );
         virtual BOOL    exportBuffer(LLString& buffer );
 
+        // If takes focus, will take keyboard focus on click.
+        void                    setTakesFocus(BOOL b)                                   { mTakesFocus = b; }
+
         void                    setSourceID(const LLUUID& id)                   { mSourceID = id; }
         void                    setAcceptCallingCardNames(BOOL enable)  { mAcceptCallingCardNames = enable; }
 
@@ -234,13 +238,17 @@ public:
         void                    setText(const LLStringExplicit &utf8str);
         void                    setWText(const LLWString &wtext);
         
-        S32                             getMaxLength() const                    { return mMaxTextLength; }
+        // Returns byte length limit
+        S32                             getMaxLength() const                    { return mMaxTextByteLength; }
 
         // Change cursor
         void                    startOfLine();
         void                    endOfLine();
         void                    endOfDoc();
-        
+
+        BOOL                    isScrolledToTop();
+        BOOL                    isScrolledToBottom();
+
         // Getters
         const LLWString& getWText() const;
         llwchar                 getWChar(S32 pos);
@@ -259,6 +267,7 @@ protected:
         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                    drawPreeditMarker();
 
         void                    updateLineStartList(S32 startpos = 0);
         void                    updateScrollFromCursor();
@@ -267,7 +276,7 @@ protected:
         void                    pruneSegments();
 
         void                    assignEmbedded(const LLString &s);
-        void                    truncate();
+        BOOL                    truncate();                             // Returns true if truncation occurs
         
         static BOOL             isPartOfWord(llwchar c);
 
@@ -291,7 +300,7 @@ protected:
         BOOL                    handleControlKey(const KEY key, const MASK mask);
         BOOL                    handleEditKey(const KEY key, const MASK mask);
 
-        BOOL                    hasSelection() { return (mSelectionStart !=mSelectionEnd); }
+        BOOL                    hasSelection() const            { return (mSelectionStart !=mSelectionEnd); }
         BOOL                    selectionContainsLineBreaks();
         void                    startSelection();
         void                    endSelection();
@@ -300,8 +309,8 @@ protected:
         S32                             prevWordPos(S32 cursorPos) const;
         S32                             nextWordPos(S32 cursorPos) const;
 
-        S32                     getLineCount();
-        S32                     getLineStart( S32 line );
+        S32                     getLineCount() const;
+        S32                     getLineStart( S32 line ) const;
         void                    getLineAndOffset(S32 pos, S32* linep, S32* offsetp);
         S32                             getPos(S32 line, S32 offset);
 
@@ -338,6 +347,20 @@ protected:
         S32                     removeStringNoUndo(S32 pos, S32 length);
         S32                             overwriteCharNoUndo(S32 pos, llwchar wc);
         
+protected:
+        void                    updateAllowingLanguageInput();
+        BOOL                    hasPreeditString() const;
+
+        // Overrides LLPreeditor
+        virtual void    resetPreedit();
+        virtual void    updatePreedit(const LLWString &preedit_string,
+                                                const segment_lengths_t &preedit_segment_lengths, const standouts_t &preedit_standouts, S32 caret_position);
+        virtual void    markAsPreedit(S32 position, S32 length);
+        virtual void    getPreeditRange(S32 *position, S32 *length) const;
+        virtual void    getSelectionRange(S32 *position, S32 *length) const;
+        virtual BOOL    getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect *bounds, LLRect *control) const;
+        virtual S32             getPreeditFontSize() const;
+
 public:
         LLKeywords              mKeywords;
         static LLColor4 mLinkColor;
@@ -349,7 +372,7 @@ protected:
         mutable LLString mUTF8Text;
         mutable BOOL    mTextIsUpToDate;
         
-        S32                             mMaxTextLength;         // Maximum length mText is allowed to be
+        S32                             mMaxTextByteLength;             // Maximum length mText is allowed to be in bytes
 
         const LLFontGL* mGLFont;
 
@@ -407,6 +430,7 @@ protected:
         LLColor4                mCursorColor;
 
         LLColor4                mFgColor;
+        LLColor4                mDefaultColor;
         LLColor4                mReadOnlyFgColor;
         LLColor4                mWriteableBgColor;
         LLColor4                mReadOnlyBgColor;
@@ -420,6 +444,8 @@ protected:
         BOOL                    mTakesFocus;
         BOOL                    mHideScrollbarForShortDocs;
         BOOL                    mTakesNonScrollClicks;
+        BOOL                    mTrackBottom;                   // if true, keeps scroll position at bottom during resize
+        BOOL                    mScrolledToBottom;
 
         BOOL                    mAllowEmbeddedItems;
 
@@ -439,6 +465,11 @@ protected:
 
         BOOL                    mParseHTML;
         LLString                mHTML;
+
+        LLWString                       mPreeditWString;
+        LLWString                       mPreeditOverwrittenWString;
+        std::vector<S32>        mPreeditPositions;
+        std::vector<BOOL>       mPreeditStandouts;
 };
 
 class LLTextSegment
diff --git a/linden/indra/llui/llui.cpp b/linden/indra/llui/llui.cpp
index 96f293e..f6ce985 100644
--- a/linden/indra/llui/llui.cpp
+++ b/linden/indra/llui/llui.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -79,7 +79,7 @@ LLVector2		LLUI::sGLScaleFactor(1.f, 1.f);
 LLWindow*               LLUI::sWindow = NULL;
 LLHtmlHelp*             LLUI::sHtmlHelp = NULL;
 BOOL            LLUI::sShowXUINames = FALSE;
-std::stack<LLRect> LLUI::sClipRectStack;
+std::stack<LLRect> LLScreenClipRect::sClipRectStack;
 
 //
 // Functions
@@ -410,39 +410,76 @@ void gl_corners_2d(S32 left, S32 top, S32 right, S32 bottom, S32 length, F32 max
 }
 
 
-void gl_draw_image( S32 x, S32 y, LLImageGL* image, const LLColor4& color )
+void gl_draw_image( S32 x, S32 y, LLImageGL* image, const LLColor4& color, const LLRectf& uv_rect )
 {
-        gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), 0.f, image, color );
+        if (NULL == image)
+        {
+                llwarns << "image == NULL; aborting function" << llendl;
+                return;
+        }
+        gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), 0.f, image, color, uv_rect );
 }
 
-void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color)
+void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color, const LLRectf& uv_rect)
 {
-        gl_draw_scaled_rotated_image( x, y, width, height, 0.f, image, color );
+        if (NULL == image)
+        {
+                llwarns << "image == NULL; aborting function" << llendl;
+                return;
+        }
+        gl_draw_scaled_rotated_image( x, y, width, height, 0.f, image, color, uv_rect );
 }
 
-void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border_height, S32 width, S32 height, LLImageGL* image, const LLColor4& color, BOOL solid_color)
+void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border_height, S32 width, S32 height, LLImageGL* image, const LLColor4& color, BOOL solid_color, const LLRectf& uv_rect)
 {
-        stop_glerror();
-        F32 border_scale = 1.f;
-
         if (NULL == image)
         {
                 llwarns << "image == NULL; aborting function" << llendl;
                 return;
         }
 
-        if (border_height * 2 > height)
-        {
-                border_scale = (F32)height / ((F32)border_height * 2.f);
-        }
-        if (border_width * 2 > width)
+        // scale screen size of borders down
+        F32 border_width_fraction = (F32)border_width / (F32)image->getWidth(0);
+        F32 border_height_fraction = (F32)border_height / (F32)image->getHeight(0);
+
+        LLRectf scale_rect(border_width_fraction, 1.f - border_height_fraction, 1.f - border_width_fraction, border_height_fraction);
+        gl_draw_scaled_image_with_border(x, y, width, height, image, color, solid_color, uv_rect, scale_rect);
+}
+
+void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color, BOOL solid_color, const LLRectf& uv_rect, const LLRectf& scale_rect)
+{
+        stop_glerror();
+
+        if (NULL == image)
         {
-                border_scale = llmin(border_scale, (F32)width / ((F32)border_width * 2.f));
+                llwarns << "image == NULL; aborting function" << llendl;
+                return;
         }
 
         // scale screen size of borders down
-        S32 scaled_border_width = llfloor(border_scale * (F32)border_width);
-        S32 scaled_border_height = llfloor(border_scale * (F32)border_height);
+        LLRectf clipped_scale_rect = uv_rect;
+        clipped_scale_rect.intersectWith(scale_rect);
+
+        LLRect draw_rect(0, height, width, 0);
+        LLRect draw_scale_rect(llround((F32)image->getWidth() * scale_rect.mLeft),
+                                                llround((F32)image->getHeight() * scale_rect.mTop),
+                                                llround((F32)image->getWidth() * scale_rect.mRight),
+                                                llround((F32)image->getHeight() * scale_rect.mBottom));
+        // scale fixed region of image up with drawn region
+        draw_scale_rect.mRight += width - image->getWidth();
+        draw_scale_rect.mTop += height - image->getHeight();
+
+        S32 border_shrink_width = llmax(0, draw_scale_rect.mLeft - draw_scale_rect.mRight);
+        S32 border_shrink_height = llmax(0, draw_scale_rect.mBottom - draw_scale_rect.mTop);
+
+        F32 shrink_width_ratio = scale_rect.getWidth() == 1.f ? 0.f : border_shrink_width / ((F32)image->getWidth() * (1.f - scale_rect.getWidth()));
+        F32 shrink_height_ratio = scale_rect.getHeight() == 1.f ? 0.f : border_shrink_height / ((F32)image->getHeight() * (1.f - scale_rect.getHeight()));
+
+        F32 shrink_scale = 1.f - llmax(shrink_width_ratio, shrink_height_ratio);
+        draw_scale_rect.mLeft = llround((F32)draw_scale_rect.mLeft * shrink_scale);
+        draw_scale_rect.mTop = llround(lerp((F32)height, (F32)draw_scale_rect.mTop, shrink_scale));
+        draw_scale_rect.mRight = llround(lerp((F32)width, (F32)draw_scale_rect.mRight, shrink_scale));
+        draw_scale_rect.mBottom = llround((F32)draw_scale_rect.mBottom * shrink_scale);
 
         LLGLSUIDefault gls_ui;
         
@@ -470,127 +507,124 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border
 
                 glColor4fv(color.mV);
                 
-                F32 border_width_fraction = (F32)border_width / (F32)image->getWidth(0);
-                F32 border_height_fraction = (F32)border_height / (F32)image->getHeight(0);
-
                 glBegin(GL_QUADS);
                 {
                         // draw bottom left
-                        glTexCoord2f(0.f, 0.f);
+                        glTexCoord2d(uv_rect.mLeft, uv_rect.mBottom);
                         glVertex2i(0, 0);
 
-                        glTexCoord2f(border_width_fraction, 0.f);
-                        glVertex2i(scaled_border_width, 0);
+                        glTexCoord2f(clipped_scale_rect.mLeft, uv_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mLeft, 0);
 
-                        glTexCoord2f(border_width_fraction, border_height_fraction);
-                        glVertex2i(scaled_border_width, scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(0.f, border_height_fraction);
-                        glVertex2i(0, scaled_border_height);
+                        glTexCoord2d(uv_rect.mLeft, clipped_scale_rect.mBottom);
+                        glVertex2i(0, draw_scale_rect.mBottom);
 
                         // draw bottom middle
-                        glTexCoord2f(border_width_fraction, 0.f);
-                        glVertex2i(scaled_border_width, 0);
+                        glTexCoord2f(clipped_scale_rect.mLeft, uv_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mLeft, 0);
 
-                        glTexCoord2f(1.f - border_width_fraction, 0.f);
-                        glVertex2i(width - scaled_border_width, 0);
+                        glTexCoord2d(clipped_scale_rect.mRight, uv_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mRight, 0);
 
-                        glTexCoord2f(1.f - border_width_fraction, border_height_fraction);
-                        glVertex2i(width - scaled_border_width, scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(border_width_fraction, border_height_fraction);
-                        glVertex2i(scaled_border_width, scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
 
                         // draw bottom right
-                        glTexCoord2f(1.f - border_width_fraction, 0.f);
-                        glVertex2i(width - scaled_border_width, 0);
+                        glTexCoord2d(clipped_scale_rect.mRight, uv_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mRight, 0);
 
-                        glTexCoord2f(1.f, 0.f);
+                        glTexCoord2d(uv_rect.mRight, uv_rect.mBottom);
                         glVertex2i(width, 0);
 
-                        glTexCoord2f(1.f, border_height_fraction);
-                        glVertex2i(width, scaled_border_height);
+                        glTexCoord2d(uv_rect.mRight, clipped_scale_rect.mBottom);
+                        glVertex2i(width, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(1.f - border_width_fraction, border_height_fraction);
-                        glVertex2i(width - scaled_border_width, scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
 
                         // draw left 
-                        glTexCoord2f(0.f, border_height_fraction);
-                        glVertex2i(0, scaled_border_height);
+                        glTexCoord2d(uv_rect.mLeft, clipped_scale_rect.mBottom);
+                        glVertex2i(0, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(border_width_fraction, border_height_fraction);
-                        glVertex2i(scaled_border_width, scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(scaled_border_width, height - scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
 
-                        glTexCoord2f(0.f, 1.f - border_height_fraction);
-                        glVertex2i(0, height - scaled_border_height);
+                        glTexCoord2d(uv_rect.mLeft, clipped_scale_rect.mTop);
+                        glVertex2i(0, draw_scale_rect.mTop);
 
                         // draw middle
-                        glTexCoord2f(border_width_fraction, border_height_fraction);
-                        glVertex2i(scaled_border_width, scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(1.f - border_width_fraction, border_height_fraction);
-                        glVertex2i(width - scaled_border_width, scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(1.f - border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(width - scaled_border_width, height - scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
 
-                        glTexCoord2f(border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(scaled_border_width, height - scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
 
                         // draw right 
-                        glTexCoord2f(1.f - border_width_fraction, border_height_fraction);
-                        glVertex2i(width - scaled_border_width, scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mBottom);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(1.f, border_height_fraction);
-                        glVertex2i(width, scaled_border_height);
+                        glTexCoord2d(uv_rect.mRight, clipped_scale_rect.mBottom);
+                        glVertex2i(width, draw_scale_rect.mBottom);
 
-                        glTexCoord2f(1.f, 1.f - border_height_fraction);
-                        glVertex2i(width, height - scaled_border_height);
+                        glTexCoord2d(uv_rect.mRight, clipped_scale_rect.mTop);
+                        glVertex2i(width, draw_scale_rect.mTop);
 
-                        glTexCoord2f(1.f - border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(width - scaled_border_width, height - scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
 
                         // draw top left
-                        glTexCoord2f(0.f, 1.f - border_height_fraction);
-                        glVertex2i(0, height - scaled_border_height);
+                        glTexCoord2d(uv_rect.mLeft, clipped_scale_rect.mTop);
+                        glVertex2i(0, draw_scale_rect.mTop);
 
-                        glTexCoord2f(border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(scaled_border_width, height - scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
 
-                        glTexCoord2f(border_width_fraction, 1.f);
-                        glVertex2i(scaled_border_width, height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, uv_rect.mTop);
+                        glVertex2i(draw_scale_rect.mLeft, height);
 
-                        glTexCoord2f(0.f, 1.f);
+                        glTexCoord2d(uv_rect.mLeft, uv_rect.mTop);
                         glVertex2i(0, height);
 
                         // draw top middle
-                        glTexCoord2f(border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(scaled_border_width, height - scaled_border_height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mLeft, draw_scale_rect.mTop);
 
-                        glTexCoord2f(1.f - border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(width - scaled_border_width, height - scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
 
-                        glTexCoord2f(1.f - border_width_fraction, 1.f);
-                        glVertex2i(width - scaled_border_width, height);
+                        glTexCoord2d(clipped_scale_rect.mRight, uv_rect.mTop);
+                        glVertex2i(draw_scale_rect.mRight, height);
 
-                        glTexCoord2f(border_width_fraction, 1.f);
-                        glVertex2i(scaled_border_width, height);
+                        glTexCoord2f(clipped_scale_rect.mLeft, uv_rect.mTop);
+                        glVertex2i(draw_scale_rect.mLeft, height);
 
                         // draw top right
-                        glTexCoord2f(1.f - border_width_fraction, 1.f - border_height_fraction);
-                        glVertex2i(width - scaled_border_width, height - scaled_border_height);
+                        glTexCoord2d(clipped_scale_rect.mRight, clipped_scale_rect.mTop);
+                        glVertex2i(draw_scale_rect.mRight, draw_scale_rect.mTop);
 
-                        glTexCoord2f(1.f, 1.f - border_height_fraction);
-                        glVertex2i(width, height - scaled_border_height);
+                        glTexCoord2d(uv_rect.mRight, clipped_scale_rect.mTop);
+                        glVertex2i(width, draw_scale_rect.mTop);
 
-                        glTexCoord2f(1.f, 1.f);
+                        glTexCoord2d(uv_rect.mRight, uv_rect.mTop);
                         glVertex2i(width, height);
 
-                        glTexCoord2f(1.f - border_width_fraction, 1.f);
-                        glVertex2i(width - scaled_border_width, height);
+                        glTexCoord2d(clipped_scale_rect.mRight, uv_rect.mTop);
+                        glVertex2i(draw_scale_rect.mRight, height);
                 }
                 glEnd();
         }
@@ -602,12 +636,12 @@ void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border
         }
 }
 
-void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLImageGL* image, const LLColor4& color)
+void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLImageGL* image, const LLColor4& color, const LLRectf& uv_rect)
 {
-        gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), degrees, image, color );
+        gl_draw_scaled_rotated_image( x, y, image->getWidth(0), image->getHeight(0), degrees, image, color, uv_rect );
 }
 
-void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLImageGL* image, const LLColor4& color)
+void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees, LLImageGL* image, const LLColor4& color, const LLRectf& uv_rect)
 {
         if (NULL == image)
         {
@@ -635,16 +669,16 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
                 
                 glBegin(GL_QUADS);
                 {
-                        glTexCoord2f(1.f, 1.f);
+                        glTexCoord2f(uv_rect.mRight, uv_rect.mTop);
                         glVertex2i(width, height );
 
-                        glTexCoord2f(0.f, 1.f);
+                        glTexCoord2f(uv_rect.mLeft, uv_rect.mTop);
                         glVertex2i(0, height );
 
-                        glTexCoord2f(0.f, 0.f);
+                        glTexCoord2f(uv_rect.mLeft, uv_rect.mBottom);
                         glVertex2i(0, 0);
 
-                        glTexCoord2f(1.f, 0.f);
+                        glTexCoord2f(uv_rect.mRight, uv_rect.mBottom);
                         glVertex2i(width, 0);
                 }
                 glEnd();
@@ -653,7 +687,7 @@ void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degre
 }
 
 
-void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color)
+void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color, const LLRectf& uv_rect)
 {
         if (NULL == image)
         {
@@ -673,16 +707,16 @@ void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageG
                 
                 glBegin(GL_QUADS);
                 {
-                        glTexCoord2f(1.f, 0.f);
+                        glTexCoord2f(uv_rect.mRight, uv_rect.mBottom);
                         glVertex2i(width, height );
 
-                        glTexCoord2f(0.f, 0.f);
+                        glTexCoord2f(uv_rect.mLeft, uv_rect.mBottom);
                         glVertex2i(0, height );
 
-                        glTexCoord2f(0.f, 1.f);
+                        glTexCoord2f(uv_rect.mLeft, uv_rect.mTop);
                         glVertex2i(0, 0);
 
-                        glTexCoord2f(1.f, 1.f);
+                        glTexCoord2f(uv_rect.mRight, uv_rect.mTop);
                         glVertex2i(width, 0);
                 }
                 glEnd();
@@ -1584,40 +1618,6 @@ void LLUI::loadIdentity()
         LLFontGL::sCurOrigin.mZ = 0;
 }
 
-//static 
-void LLUI::setScissorRegionScreen(const LLRect& rect)
-{
-        stop_glerror();
-        S32 x,y,w,h;
-        x = llround(rect.mLeft * LLUI::sGLScaleFactor.mV[VX]);
-        y = llround(rect.mBottom * LLUI::sGLScaleFactor.mV[VY]);
-        w = llround(rect.getWidth() * LLUI::sGLScaleFactor.mV[VX]);
-        h = llround(rect.getHeight() * LLUI::sGLScaleFactor.mV[VY]);
-        glScissor( x,y,w,h );
-        stop_glerror();
-}
-
-//static
-void LLUI::setScissorRegionLocal(const LLRect& rect)
-{
-        stop_glerror();
-        S32 screen_left = LLFontGL::sCurOrigin.mX + rect.mLeft;
-        S32 screen_bottom = LLFontGL::sCurOrigin.mY + rect.mBottom;
-        
-        S32 x,y,w,h;
-        
-        x = llround((F32)screen_left * LLUI::sGLScaleFactor.mV[VX]);
-        y = llround((F32)screen_bottom * LLUI::sGLScaleFactor.mV[VY]);
-        w = llround((F32)rect.getWidth() * LLUI::sGLScaleFactor.mV[VX]);
-        h = llround((F32)rect.getHeight() * LLUI::sGLScaleFactor.mV[VY]);
-        
-        w = llmax(0,w);
-        h = llmax(0,h);
-        
-        glScissor(x,y,w,h);
-        stop_glerror();
-}
-
 //static
 void LLUI::setScaleFactor(const LLVector2 &scale_factor)
 {
@@ -1696,6 +1696,34 @@ LLVector2 LLUI::getWindowSize()
 }
 
 //static
+void LLUI::screenPointToGL(S32 screen_x, S32 screen_y, S32 *gl_x, S32 *gl_y)
+{
+        *gl_x = llround((F32)screen_x * sGLScaleFactor.mV[VX]);
+        *gl_y = llround((F32)screen_y * sGLScaleFactor.mV[VY]);
+}
+
+//static
+void LLUI::glPointToScreen(S32 gl_x, S32 gl_y, S32 *screen_x, S32 *screen_y)
+{
+        *screen_x = llround((F32)gl_x / sGLScaleFactor.mV[VX]);
+        *screen_y = llround((F32)gl_y / sGLScaleFactor.mV[VY]);
+}
+
+//static
+void LLUI::screenRectToGL(const LLRect& screen, LLRect *gl)
+{
+        screenPointToGL(screen.mLeft, screen.mTop, &gl->mLeft, &gl->mTop);
+        screenPointToGL(screen.mRight, screen.mBottom, &gl->mRight, &gl->mBottom);
+}
+
+//static
+void LLUI::glRectToScreen(const LLRect& gl, LLRect *screen)
+{
+        glPointToScreen(gl.mLeft, gl.mTop, &screen->mLeft, &screen->mTop);
+        glPointToScreen(gl.mRight, gl.mBottom, &screen->mRight, &screen->mBottom);
+}
+
+//static
 LLUUID                  LLUI::findAssetUUIDByName(const LLString        &asset_name)
 {
         if(asset_name == LLString::null) return LLUUID::null;
@@ -1710,64 +1738,169 @@ LLUUID			LLUI::findAssetUUIDByName(const LLString	&asset_name)
         return LLUUID( foundValue );
 }
 
+//static 
+LLUIImage* LLUI::getUIImageByName(const LLString& name)
+{
+        return sImageProvider->getUIImageByID(findAssetUUIDByName(name));
+}
+
+
 // static 
 void LLUI::setHtmlHelp(LLHtmlHelp* html_help)
 {
         LLUI::sHtmlHelp = html_help;
 }
 
+LLScreenClipRect::LLScreenClipRect(const LLRect& rect, BOOL enabled) : mScissorState(GL_SCISSOR_TEST), mEnabled(enabled)
+{
+        if (mEnabled)
+        {
+                pushClipRect(rect);
+        }
+        mScissorState.setEnabled(!sClipRectStack.empty());
+        updateScissorRegion();
+}
+
+LLScreenClipRect::~LLScreenClipRect()
+{
+        if (mEnabled)
+        {
+                popClipRect();
+        }
+        updateScissorRegion();
+}
+
 //static 
-void LLUI::pushClipRect(const LLRect& rect)
+void LLScreenClipRect::pushClipRect(const LLRect& rect)
 {
         LLRect combined_clip_rect = rect;
         if (!sClipRectStack.empty())
         {
-                combined_clip_rect.intersectWith(sClipRectStack.top());
+                LLRect top = sClipRectStack.top();
+                combined_clip_rect.intersectWith(top);
         }
         sClipRectStack.push(combined_clip_rect);
-        setScissorRegionScreen(combined_clip_rect);
 }
 
 //static 
-void LLUI::popClipRect()
+void LLScreenClipRect::popClipRect()
 {
         sClipRectStack.pop();
-        if (!sClipRectStack.empty())
-        {
-                setScissorRegionScreen(sClipRectStack.top());
-        }
 }
 
-LLClipRect::LLClipRect(const LLRect& rect, BOOL enabled) : mScissorState(GL_SCISSOR_TEST, enabled), mEnabled(enabled)
+//static
+void LLScreenClipRect::updateScissorRegion()
 {
-        if (mEnabled)
-        {
-                LLUI::pushClipRect(rect);
-        }
+        if (sClipRectStack.empty()) return;
+
+        LLRect rect = sClipRectStack.top();
+        stop_glerror();
+        S32 x,y,w,h;
+        x = llfloor(rect.mLeft * LLUI::sGLScaleFactor.mV[VX]);
+        y = llfloor(rect.mBottom * LLUI::sGLScaleFactor.mV[VY]);
+        w = llmax(0, llceil(rect.getWidth() * LLUI::sGLScaleFactor.mV[VX])) + 1;
+        h = llmax(0, llceil(rect.getHeight() * LLUI::sGLScaleFactor.mV[VY])) + 1;
+        glScissor( x,y,w,h );
+        stop_glerror();
 }
 
-LLClipRect::~LLClipRect()
+
+LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled) 
+: LLScreenClipRect(LLRect(rect.mLeft + LLFontGL::sCurOrigin.mX, 
+                                                rect.mTop + LLFontGL::sCurOrigin.mY, 
+                                                rect.mRight + LLFontGL::sCurOrigin.mX, 
+                                                rect.mBottom + LLFontGL::sCurOrigin.mY),
+                                        enabled)
 {
-        if (mEnabled)
-        {
-                LLUI::popClipRect();
-        }
 }
 
-LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled) : mScissorState(GL_SCISSOR_TEST, enabled), mEnabled(enabled)
+
+//
+// LLUIImage
+//
+
+LLUIImage::LLUIImage(LLPointer<LLImageGL> image) :
+                                                mImage(image),
+                                                mScaleRegion(0.f, 1.f, 1.f, 0.f),
+                                                mClipRegion(0.f, 1.f, 1.f, 0.f),
+                                                mUniformScaling(TRUE),
+                                                mNoClip(TRUE)
 {
-        if (mEnabled)
-        {
-                LLRect scissor_rect = rect;
-                scissor_rect.translate(LLFontGL::sCurOrigin.mX, LLFontGL::sCurOrigin.mY);
-                LLUI::pushClipRect(scissor_rect);
-        }
 }
 
-LLLocalClipRect::~LLLocalClipRect()
+void LLUIImage::setClipRegion(const LLRectf& region) 
+{ 
+        mClipRegion = region; 
+        mNoClip = mClipRegion.mLeft == 0.f
+                                && mClipRegion.mRight == 1.f
+                                && mClipRegion.mBottom == 0.f
+                                && mClipRegion.mTop == 1.f;
+}
+
+void LLUIImage::setScaleRegion(const LLRectf& region) 
+{ 
+        mScaleRegion = region; 
+        mUniformScaling = mScaleRegion.mLeft == 0.f
+                                        && mScaleRegion.mRight == 1.f
+                                        && mScaleRegion.mBottom == 0.f
+                                        && mScaleRegion.mTop == 1.f;
+}
+
+//TODO: move drawing implementation inside class
+void LLUIImage::draw(S32 x, S32 y, const LLColor4& color)
 {
-        if (mEnabled)
+        gl_draw_image(x, y, mImage, color, mClipRegion);
+}
+
+void LLUIImage::draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color)
+{
+        if (mUniformScaling)
+        {
+                gl_draw_scaled_image(x, y, width, height, mImage, color, mClipRegion);
+        }
+        else
         {
-                LLUI::popClipRect();
+                gl_draw_scaled_image_with_border(
+                        x, y, 
+                        width, height, 
+                        mImage, 
+                        color,
+                        FALSE,
+                        mClipRegion,
+                        mScaleRegion);
         }
 }
+
+void LLUIImage::drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color)
+{
+        gl_draw_scaled_image_with_border(
+                x, y, 
+                width, height, 
+                mImage, 
+                color, 
+                TRUE,
+                mClipRegion,
+                mScaleRegion);
+}
+
+void LLUIImage::drawSolid(S32 x, S32 y, const LLColor4& color)
+{
+        gl_draw_scaled_image_with_border(
+                x, y, 
+                getWidth(), getHeight(), 
+                mImage, 
+                color, 
+                TRUE,
+                mClipRegion,
+                mScaleRegion);
+}
+
+S32 LLUIImage::getWidth()
+{ 
+        return mImage->getWidth(0); 
+}
+
+S32 LLUIImage::getHeight()
+{ 
+        return mImage->getHeight(0); 
+}
diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index 2832b39..9d98620 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -41,14 +41,15 @@
 #include "llhtmlhelp.h"
 #include "llgl.h"
 #include <stack>
+#include "llimagegl.h"
 
 class LLColor4;
 class LLVector3;
 class LLVector2;
-class LLImageGL;
 class LLUUID;
 class LLWindow;
 class LLView;
+class LLUIImage;
 
 // UI colors
 extern const LLColor4 UI_VERTEX_COLOR;
@@ -83,13 +84,14 @@ void gl_washer_2d(F32 outer_radius, F32 inner_radius, S32 steps, const LLColor4&
 void gl_washer_segment_2d(F32 outer_radius, F32 inner_radius, F32 start_radians, F32 end_radians, S32 steps, const LLColor4& inner_color, const LLColor4& outer_color);
 void gl_washer_spokes_2d(F32 outer_radius, F32 inner_radius, S32 count, const LLColor4& inner_color, const LLColor4& outer_color);
 
-void gl_draw_image(S32 x, S32 y, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR);
-void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR);
-void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR);
-void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees,LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR);
-void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border_height, S32 width, S32 height, LLImageGL* image, const LLColor4 &color, BOOL solid_color = FALSE);
+void gl_draw_image(S32 x, S32 y, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
+void gl_draw_scaled_image(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
+void gl_draw_rotated_image(S32 x, S32 y, F32 degrees, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
+void gl_draw_scaled_rotated_image(S32 x, S32 y, S32 width, S32 height, F32 degrees,LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
+void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 border_width, S32 border_height, S32 width, S32 height, LLImageGL* image, const LLColor4 &color, BOOL solid_color = FALSE, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
+void gl_draw_scaled_image_with_border(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4 &color, BOOL solid_color = FALSE, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f), const LLRectf& scale_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
 // Flip vertical, used for LLFloaterHTML
-void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR);
+void gl_draw_scaled_image_inverted(S32 x, S32 y, S32 width, S32 height, LLImageGL* image, const LLColor4& color = UI_VERTEX_COLOR, const LLRectf& uv_rect = LLRectf(0.f, 1.f, 1.f, 0.f));
 
 void gl_rect_2d_xor(S32 left, S32 top, S32 right, S32 bottom);
 void gl_stippled_line_3d( const LLVector3& start, const LLVector3& end, const LLColor4& color, F32 phase = 0.f ); 
@@ -166,20 +168,19 @@ public:
 
         //helper functions (should probably move free standing rendering helper functions here)
         static LLString locateSkin(const LLString& filename);
-        static void pushClipRect(const LLRect& rect);
-        static void popClipRect();
         static void setCursorPositionScreen(S32 x, S32 y);
         static void setCursorPositionLocal(LLView* viewp, S32 x, S32 y);
         static void setScaleFactor(const LLVector2& scale_factor);
         static void setLineWidth(F32 width);
         static LLUUID findAssetUUIDByName(const LLString&       name);
+        static LLUIImage* getUIImageByName(const LLString& name);
         static LLVector2 getWindowSize();
+        static void screenPointToGL(S32 screen_x, S32 screen_y, S32 *gl_x, S32 *gl_y);
+        static void glPointToScreen(S32 gl_x, S32 gl_y, S32 *screen_x, S32 *screen_y);
+        static void screenRectToGL(const LLRect& screen, LLRect *gl);
+        static void glRectToScreen(const LLRect& gl, LLRect *screen);
         static void setHtmlHelp(LLHtmlHelp* html_help);
 
-private:
-        static void setScissorRegionScreen(const LLRect& rect);
-        static void setScissorRegionLocal(const LLRect& rect); // works assuming LLUI::translate has been called
-
 public:
         static LLControlGroup* sConfigGroup;
         static LLControlGroup* sColorsGroup;
@@ -190,7 +191,6 @@ public:
         static LLWindow*                sWindow;
         static BOOL             sShowXUINames;
         static LLHtmlHelp*              sHtmlHelp;
-        static std::stack<LLRect> sClipRectStack;
 
 };
 
@@ -282,6 +282,7 @@ typedef enum e_widget_type
         WIDGET_TYPE_MEMORY_VIEW,
         WIDGET_TYPE_FRAME_STAT_VIEW,
         WIDGET_TYPE_LAYOUT_STACK,
+        WIDGET_TYPE_FLYOUT_BUTTON,
         WIDGET_TYPE_DONTCARE,
         WIDGET_TYPE_COUNT
 } EWidgetType;
@@ -378,24 +379,65 @@ protected:
 
 template <class T, class U> T* LLUISingleton<T,U>::sInstance = NULL;
 
-class LLClipRect
+class LLScreenClipRect
 {
 public:
-        LLClipRect(const LLRect& rect, BOOL enabled = TRUE);
-        virtual ~LLClipRect();
-protected:
+        LLScreenClipRect(const LLRect& rect, BOOL enabled = TRUE);
+        virtual ~LLScreenClipRect();
+
+private:
+        static void pushClipRect(const LLRect& rect);
+        static void popClipRect();
+        static void updateScissorRegion();
+
+private:
         LLGLState               mScissorState;
         BOOL                    mEnabled;
+
+        static std::stack<LLRect> sClipRectStack;
 };
 
-class LLLocalClipRect
+class LLLocalClipRect : public LLScreenClipRect
 {
 public:
         LLLocalClipRect(const LLRect& rect, BOOL enabled = TRUE);
-        virtual ~LLLocalClipRect();
+};
+
+class LLUIImage : public LLRefCount
+{
+public:
+        LLUIImage(LLPointer<LLImageGL> image);
+
+        void setClipRegion(const LLRectf& region);
+        void setScaleRegion(const LLRectf& region);
+
+        LLPointer<LLImageGL> getImage() { return mImage; }
+
+        void draw(S32 x, S32 y, const LLColor4& color = UI_VERTEX_COLOR);
+        void draw(S32 x, S32 y, S32 width, S32 height, const LLColor4& color = UI_VERTEX_COLOR);
+        void drawSolid(S32 x, S32 y, S32 width, S32 height, const LLColor4& color);
+        void drawSolid(S32 x, S32 y, const LLColor4& color);
+
+        S32 getWidth();
+        S32 getHeight();
+
 protected:
-        LLGLState               mScissorState;
-        BOOL                    mEnabled;
+        LLRectf                         mScaleRegion;
+        LLRectf                         mClipRegion;
+        LLPointer<LLImageGL> mImage;
+        BOOL                            mUniformScaling;
+        BOOL                            mNoClip;
+};
+
+//RN: maybe this needs to moved elsewhere?
+class LLImageProviderInterface
+{
+public:
+        LLImageProviderInterface() {};
+        virtual ~LLImageProviderInterface() {};
+
+        virtual LLUIImage* getUIImageByID(const LLUUID& id, BOOL clamped = TRUE) = 0;
+        virtual LLImageGL* getImageByID(const LLUUID& id, BOOL clamped = TRUE) = 0;
 };
 
 #endif
diff --git a/linden/indra/llui/llui_vc9.vcproj b/linden/indra/llui/llui_vc9.vcproj
new file mode 100644
index 0000000..cfaaf66
--- /dev/null
+++ b/linden/indra/llui/llui_vc9.vcproj
@@ -0,0 +1,596 @@
+<?xml version="1.0" encoding="Windows-1252"?>

+<VisualStudioProject

+        ProjectType="Visual C++"

+        Version="9.00"

+        Name="llui"

+        ProjectGUID="{DE55D666-6A3D-476C-937F-109269B83681}"

+        RootNamespace="llui"

+        Keyword="Win32Proj"

+        TargetFrameworkVersion="131072"

+        >

+        <Platforms>

+                <Platform

+                        Name="Win32"

+                />

+        </Platforms>

+        <ToolFiles>

+        </ToolFiles>

+        <Configurations>

+                <Configuration

+                        Name="Debug|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Debug"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;_DEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_DEBUG"

+                                MinimalRebuild="true"

+                                BasicRuntimeChecks="3"

+                                RuntimeLibrary="1"

+                                StructMemberAlignment="4"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="4"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llui.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="Release|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="Release"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalOptions="/Oy-"

+                                AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llui.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+                <Configuration

+                        Name="ReleaseNoOpt|Win32"

+                        OutputDirectory="../lib_$(ConfigurationName)/i686-win32"

+                        IntermediateDirectory="$(ConfigurationName)"

+                        ConfigurationType="4"

+                        InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

+                        CharacterSet="1"

+                        >

+                        <Tool

+                                Name="VCPreBuildEventTool"

+                        />

+                        <Tool

+                                Name="VCCustomBuildTool"

+                        />

+                        <Tool

+                                Name="VCXMLDataGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCWebServiceProxyGeneratorTool"

+                        />

+                        <Tool

+                                Name="VCMIDLTool"

+                        />

+                        <Tool

+                                Name="VCCLCompilerTool"

+                                AdditionalOptions="/Oy-"

+                                Optimization="0"

+                                AdditionalIncludeDirectories="..\llmath;..\llvfs;..\llcommon;..\llprimitive;..\llwindow;..\llrender;..\llimage;..\llaudio;..\llxml;..\llmessage;&quot;..\..\libraries\i686-win32\include&quot;;..\..\libraries\include\"

+                                PreprocessorDefinitions="WIN32;NDEBUG;_LIB;LL_WINDOWS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;_USE_32BIT_TIME_T;LL_RELEASE"

+                                RuntimeLibrary="0"

+                                StructMemberAlignment="0"

+                                TreatWChar_tAsBuiltInType="false"

+                                ForceConformanceInForLoopScope="true"

+                                UsePrecompiledHeader="0"

+                                WarningLevel="3"

+                                WarnAsError="true"

+                                Detect64BitPortabilityProblems="false"

+                                DebugInformationFormat="3"

+                        />

+                        <Tool

+                                Name="VCManagedResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCResourceCompilerTool"

+                        />

+                        <Tool

+                                Name="VCPreLinkEventTool"

+                        />

+                        <Tool

+                                Name="VCLibrarianTool"

+                                OutputFile="$(OutDir)/llui.lib"

+                        />

+                        <Tool

+                                Name="VCALinkTool"

+                        />

+                        <Tool

+                                Name="VCXDCMakeTool"

+                        />

+                        <Tool

+                                Name="VCBscMakeTool"

+                        />

+                        <Tool

+                                Name="VCFxCopTool"

+                        />

+                        <Tool

+                                Name="VCPostBuildEventTool"

+                        />

+                </Configuration>

+        </Configurations>

+        <References>

+        </References>

+        <Files>

+                <Filter

+                        Name="Source Files"

+                        Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"

+                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"

+                        >

+                        <File

+                                RelativePath=".\llalertdialog.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbutton.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcheckboxctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclipboard.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcombobox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llctrlselectioninterface.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldraghandle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleditmenuhandler.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloater.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfocusmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliconctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeywords.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllineeditor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmenugl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmodaldialog.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanel.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llradiogroup.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizebar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizehandle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresmgr.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrootview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollbar.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollcontainer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollingpanellist.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrolllistctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llslider.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsliderctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llspinctrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstyle.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainer.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainervertical.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextbox.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexteditor.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llui.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrl.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrlfactory.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluistring.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llundo.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llview.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewborder.cpp"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewquery.cpp"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Header Files"

+                        Filter="h;hpp;hxx;hm;inl;inc;xsd"

+                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"

+                        >

+                        <File

+                                RelativePath=".\llalertdialog.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llbutton.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcallbackmap.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcheckboxctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llclipboard.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llcombobox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llctrlselectioninterface.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lldraghandle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lleditmenuhandler.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfloater.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llfocusmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llhtmlhelp.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lliconctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llkeywords.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lllineeditor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmemberlistener.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmenugl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llmodaldialog.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llpanel.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llradiogroup.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizebar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresizehandle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llresmgr.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llrootview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollbar.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollcontainer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrollingpanellist.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llscrolllistctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llslider.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llsliderctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llspinctrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llstyle.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainer.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltabcontainervertical.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltextbox.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lltexteditor.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llui.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluiconstants.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrl.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluictrlfactory.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluistring.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\lluixmltags.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llundo.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llview.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewborder.h"

+                                >

+                        </File>

+                        <File

+                                RelativePath=".\llviewquery.h"

+                                >

+                        </File>

+                </Filter>

+                <Filter

+                        Name="Resource Files"

+                        Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+                        UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+                        >

+                </Filter>

+        </Files>

+        <Globals>

+        </Globals>

+</VisualStudioProject>

diff --git a/linden/indra/llui/lluiconstants.h b/linden/indra/llui/lluiconstants.h
index bd75d27..b3b9297 100644
--- a/linden/indra/llui/lluiconstants.h
+++ b/linden/indra/llui/lluiconstants.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lluictrl.cpp b/linden/indra/llui/lluictrl.cpp
index 61d6c8c..63db1cc 100644
--- a/linden/indra/llui/lluictrl.cpp
+++ b/linden/indra/llui/lluictrl.cpp
@@ -13,12 +13,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -47,11 +47,53 @@
 
 const U32 MAX_STRING_LENGTH = 10;
 
-LLUICtrl::LLUICtrl() :
-        mCommitCallback(NULL),
-        mFocusLostCallback(NULL),
+LLFocusableElement::LLFocusableElement()
+:       mFocusLostCallback(NULL),
         mFocusReceivedCallback(NULL),
         mFocusChangedCallback(NULL),
+        mFocusCallbackUserData(NULL)
+{
+}
+
+void LLFocusableElement::onFocusReceived()
+{
+        if( mFocusReceivedCallback )
+        {
+                mFocusReceivedCallback( this, mFocusCallbackUserData );
+        }
+        if( mFocusChangedCallback )
+        {
+                mFocusChangedCallback( this, mFocusCallbackUserData );
+        }
+}
+
+void LLFocusableElement::onFocusLost()
+{
+        if( mFocusLostCallback )
+        {
+                mFocusLostCallback( this, mFocusCallbackUserData );
+        }
+
+        if( mFocusChangedCallback )
+        {
+                mFocusChangedCallback( this, mFocusCallbackUserData );
+        }
+}
+
+BOOL LLFocusableElement::hasFocus() const
+{
+        return FALSE;
+}
+
+void LLFocusableElement::setFocus(BOOL b)
+{
+}
+
+
+
+LLUICtrl::LLUICtrl() :
+        mCommitCallback(NULL),
+        mLostTopCallback(NULL),
         mValidateCallback(NULL),
         mCallbackUserData(NULL),
         mTentative(FALSE),
@@ -68,9 +110,7 @@ LLUICtrl::LLUICtrl(const LLString& name, const LLRect& rect, BOOL mouse_opaque,
         // of buttons in the UI. JC 7/20/2002
         LLView( name, rect, mouse_opaque, reshape ),
         mCommitCallback( on_commit_callback) ,
-        mFocusLostCallback( NULL ),
-        mFocusReceivedCallback( NULL ),
-        mFocusChangedCallback( NULL ),
+        mLostTopCallback( NULL ),
         mValidateCallback( NULL ),
         mCallbackUserData( callback_userdata ),
         mTentative( FALSE ),
@@ -128,6 +168,86 @@ LLCtrlScrollInterface* LLUICtrl::getScrollInterface()
         return NULL; 
 }
 
+BOOL LLUICtrl::hasFocus() const
+{
+        return (gFocusMgr.childHasKeyboardFocus(this));
+}
+
+void LLUICtrl::setFocus(BOOL b)
+{
+        // focus NEVER goes to ui ctrls that are disabled!
+        if (!mEnabled)
+        {
+                return;
+        }
+        if( b )
+        {
+                if (!hasFocus())
+                {
+                        gFocusMgr.setKeyboardFocus( this );
+                }
+        }
+        else
+        {
+                if( gFocusMgr.childHasKeyboardFocus(this))
+                {
+                        gFocusMgr.setKeyboardFocus( NULL );
+                }
+        }
+}
+
+void LLUICtrl::onFocusReceived()
+{
+        // trigger callbacks
+        LLFocusableElement::onFocusReceived();
+
+        // find first view in hierarchy above new focus that is a LLUICtrl
+        LLView* viewp = getParent();
+        LLUICtrl* last_focus = gFocusMgr.getLastKeyboardFocus();
+
+        while (viewp && !viewp->isCtrl()) 
+        {
+                viewp = viewp->getParent();
+        }
+
+        // and if it has newly gained focus, call onFocusReceived()
+        LLUICtrl* ctrlp = static_cast<LLUICtrl*>(viewp);
+        if (ctrlp && (!last_focus || !last_focus->hasAncestor(ctrlp)))
+        {
+                ctrlp->onFocusReceived();
+        }
+}
+
+void LLUICtrl::onFocusLost()
+{
+        // trigger callbacks
+        LLFocusableElement::onFocusLost();
+
+        // find first view in hierarchy above old focus that is a LLUICtrl
+        LLView* viewp = getParent();
+        while (viewp && !viewp->isCtrl()) 
+        {
+                viewp = viewp->getParent();
+        }
+
+        // and if it has just lost focus, call onFocusReceived()
+        LLUICtrl* ctrlp = static_cast<LLUICtrl*>(viewp);
+        // hasFocus() includes any descendants
+        if (ctrlp && !ctrlp->hasFocus())
+        {
+                ctrlp->onFocusLost();
+        }
+}
+
+void LLUICtrl::onLostTop()
+{
+        if (mLostTopCallback)
+        {
+                mLostTopCallback(this, mCallbackUserData);
+        }
+}
+
+
 // virtual
 void LLUICtrl::setTabStop( BOOL b )     
 { 
@@ -165,68 +285,26 @@ void LLUICtrl::setIsChrome(BOOL is_chrome)
 // virtual
 BOOL LLUICtrl::getIsChrome() const
 { 
-        return mIsChrome; 
-}
+        // am I or any of my ancestors flagged as "chrome"?
+        if (mIsChrome) return TRUE;
 
-void LLUICtrl::onFocusReceived()
-{
-        if( mFocusReceivedCallback )
-        {
-                mFocusReceivedCallback( this, mCallbackUserData );
-        }
-        if( mFocusChangedCallback )
+        LLView* parent_ctrl = getParent();
+        while(parent_ctrl)
         {
-                mFocusChangedCallback( this, mCallbackUserData );
-        }
-}
-
-void LLUICtrl::onFocusLost()
-{
-        if( mFocusLostCallback )
-        {
-                mFocusLostCallback( this, mCallbackUserData );
-        }
-
-        if( mFocusChangedCallback )
-        {
-                mFocusChangedCallback( this, mCallbackUserData );
-        }
-}
-
-BOOL LLUICtrl::hasFocus() const
-{
-        return (gFocusMgr.childHasKeyboardFocus(this));
-}
-
-void LLUICtrl::setFocus(BOOL b)
-{
-        // focus NEVER goes to ui ctrls that are disabled!
-        if (!mEnabled)
-        {
-                return;
-        }
-        if( b )
-        {
-                if (!hasFocus())
+                if(parent_ctrl->isCtrl())
                 {
-                        gFocusMgr.setKeyboardFocus( this, &LLUICtrl::onFocusLostCallback );
-                        onFocusReceived();
+                        break;  
                 }
+                parent_ctrl = parent_ctrl->getParent();
         }
-        else
+        
+        if(parent_ctrl)
         {
-                if( gFocusMgr.childHasKeyboardFocus(this))
-                {
-                        gFocusMgr.setKeyboardFocus( NULL, NULL );
-                        onFocusLost();
-                }
+                // recurse into parent_ctrl and ask if it is in a chrome subtree
+                return ((LLUICtrl*)parent_ctrl)->getIsChrome();
         }
-}
 
-// static
-void LLUICtrl::onFocusLostCallback( LLUICtrl* old_focus )
-{
-        old_focus->onFocusLost();
+        return FALSE;
 }
 
 // this comparator uses the crazy disambiguating logic of LLCompareByTabOrder,
@@ -262,6 +340,7 @@ public:
         }
 };
 
+
 BOOL LLUICtrl::focusFirstItem(BOOL prefer_text_fields)
 {
         // try to select default tab group child
diff --git a/linden/indra/llui/lluictrl.h b/linden/indra/llui/lluictrl.h
index bf61f8b..55e804c 100644
--- a/linden/indra/llui/lluictrl.h
+++ b/linden/indra/llui/lluictrl.h
@@ -13,12 +13,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -53,8 +53,31 @@ class LLCtrlScrollInterface;
 typedef void (*LLUICtrlCallback)(LLUICtrl* ctrl, void* userdata);
 typedef BOOL (*LLUICtrlValidate)(LLUICtrl* ctrl, void* userdata);
 
+class LLFocusableElement
+{
+        friend class LLFocusMgr; // allow access to focus change handlers
+public:
+        LLFocusableElement();
+        virtual ~LLFocusableElement() {};
+
+        virtual void    setFocus( BOOL b );
+        virtual BOOL    hasFocus() const;
+
+        void                    setFocusLostCallback(void (*cb)(LLFocusableElement* caller, void*), void* user_data = NULL) { mFocusLostCallback = cb; mFocusCallbackUserData = user_data; }
+        void                    setFocusReceivedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL)       { mFocusReceivedCallback = cb; mFocusCallbackUserData = user_data; }
+        void                    setFocusChangedCallback( void (*cb)(LLFocusableElement*, void*), void* user_data = NULL )               { mFocusChangedCallback = cb; mFocusCallbackUserData = user_data; }
+
+protected:
+        virtual void    onFocusReceived();
+        virtual void    onFocusLost();
+        void                    (*mFocusLostCallback)( LLFocusableElement* caller, void* userdata );
+        void                    (*mFocusReceivedCallback)( LLFocusableElement* ctrl, void* userdata );
+        void                    (*mFocusChangedCallback)( LLFocusableElement* ctrl, void* userdata );
+        void*                   mFocusCallbackUserData;
+};
+
 class LLUICtrl
-: public LLView
+: public LLView, public LLFocusableElement
 {
 public:
         LLUICtrl();
@@ -85,6 +108,11 @@ public:
         virtual void    setFocus( BOOL b );
         virtual BOOL    hasFocus() const;
 
+        virtual void    onFocusReceived();
+        virtual void    onFocusLost();
+
+        virtual void    onLostTop();    // called when registered as top ctrl and user clicks elsewhere
+
         virtual void    setTabStop( BOOL b );
         virtual BOOL    hasTabStop() const;
 
@@ -115,6 +143,7 @@ public:
         
         void                    setCommitCallback( void (*cb)(LLUICtrl*, void*) )               { mCommitCallback = cb; }
         void                    setValidateBeforeCommit( BOOL(*cb)(LLUICtrl*, void*) )  { mValidateCallback = cb; }
+        void                    setLostTopCallback( void (*cb)(LLUICtrl*, void*) )              { mLostTopCallback = cb; }
 
         // Defaults to no-op!
         virtual void    setDoubleClickCallback( void (*cb)(void*) );
@@ -126,23 +155,8 @@ public:
         virtual void    setMinValue(LLSD min_value);
         virtual void    setMaxValue(LLSD max_value);
 
-        // In general, only LLPanel uses these.
-        void                    setFocusLostCallback(void (*cb)(LLUICtrl* caller, void* user_data)) { mFocusLostCallback = cb; }
-        void                    setFocusReceivedCallback( void (*cb)(LLUICtrl*, void*) )        { mFocusReceivedCallback = cb; }
-        void                    setFocusChangedCallback( void (*cb)(LLUICtrl*, void*) )         { mFocusChangedCallback = cb; }
-
-        static void             onFocusLostCallback(LLUICtrl* old_focus);
-
         /*virtual*/ BOOL focusFirstItem(BOOL prefer_text_fields = FALSE );
 
-        class LLTabStopPostFilter : public LLQueryFilter, public LLSingleton<LLTabStopPostFilter>
-        {
-                /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
-                {
-                        return filterResult_t(view->isCtrl() && static_cast<const LLUICtrl *>(view)->hasTabStop() && children.size() == 0, TRUE);
-                }
-        };
-
         class LLTextInputFilter : public LLQueryFilter, public LLSingleton<LLTextInputFilter>
         {
                 /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
@@ -157,16 +171,9 @@ public:
         virtual void    resetDirty()                    {};
 
 protected:
-        virtual void    onFocusReceived();
-        virtual void    onFocusLost();
-        void                    onChangeFocus( S32 direction );
-
-protected:
 
         void                    (*mCommitCallback)( LLUICtrl* ctrl, void* userdata );
-        void                    (*mFocusLostCallback)( LLUICtrl* caller, void* userdata );
-        void                    (*mFocusReceivedCallback)( LLUICtrl* ctrl, void* userdata );
-        void                    (*mFocusChangedCallback)( LLUICtrl* ctrl, void* userdata );
+        void                    (*mLostTopCallback)( LLUICtrl* ctrl, void* userdata );
         BOOL                    (*mValidateCallback)( LLUICtrl* ctrl, void* userdata );
 
         void*                   mCallbackUserData;
diff --git a/linden/indra/llui/lluictrlfactory.cpp b/linden/indra/llui/lluictrlfactory.cpp
index 98228d5..a51d8e4 100644
--- a/linden/indra/llui/lluictrlfactory.cpp
+++ b/linden/indra/llui/lluictrlfactory.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -173,7 +173,7 @@ std::vector<LLString> LLUICtrlFactory::mXUIPaths;
 class LLUICtrlLocate : public LLUICtrl
 {
 public:
-        LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) {}
+        LLUICtrlLocate() : LLUICtrl("locate", LLRect(0,0,0,0), FALSE, NULL, NULL) { setTabStop(FALSE); }
         virtual void draw() { }
 
         virtual EWidgetType getWidgetType() const { return WIDGET_TYPE_LOCATE; }
@@ -181,7 +181,11 @@ public:
 
         static LLView *fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
         {
+                LLString name("pad");
+                node->getAttributeString("name", name);
+
                 LLUICtrlLocate *new_ctrl = new LLUICtrlLocate();
+                new_ctrl->setName(name);
                 new_ctrl->initFromXML(node, parent);
                 return new_ctrl;
         }
@@ -196,6 +200,7 @@ LLUICtrlFactory::LLUICtrlFactory()
         LLUICtrlCreator<LLButton>::registerCreator(LL_BUTTON_TAG, this);
         LLUICtrlCreator<LLCheckBoxCtrl>::registerCreator(LL_CHECK_BOX_CTRL_TAG, this);
         LLUICtrlCreator<LLComboBox>::registerCreator(LL_COMBO_BOX_TAG, this);
+        LLUICtrlCreator<LLFlyoutButton>::registerCreator(LL_FLYOUT_BUTTON_TAG, this);
         LLUICtrlCreator<LLLineEditor>::registerCreator(LL_LINE_EDITOR_TAG, this);
         LLUICtrlCreator<LLSearchEditor>::registerCreator(LL_SEARCH_EDITOR_TAG, this);
         LLUICtrlCreator<LLScrollListCtrl>::registerCreator(LL_SCROLL_LIST_CTRL_TAG, this);
@@ -282,8 +287,11 @@ bool LLUICtrlFactory::getLayeredXMLNode(const LLString &filename, LLXMLNodePtr&
         
         if (!LLXMLNode::parseFile(mXUIPaths.front() + filename, root, NULL))
         {       
-                llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl;
-                return FALSE;
+                if (!LLXMLNode::parseFile(filename, root, NULL))
+                {
+                        llwarns << "Problem reading UI description file: " << mXUIPaths.front() + filename << llendl;
+                        return FALSE;
+                }
         }
 
         LLXMLNodePtr updateRoot;
diff --git a/linden/indra/llui/lluictrlfactory.h b/linden/indra/llui/lluictrlfactory.h
index 22fac59..fbb8d96 100644
--- a/linden/indra/llui/lluictrlfactory.h
+++ b/linden/indra/llui/lluictrlfactory.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lluistring.cpp b/linden/indra/llui/lluistring.cpp
index 36fba17..d3b5a52 100644
--- a/linden/indra/llui/lluistring.cpp
+++ b/linden/indra/llui/lluistring.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lluistring.h b/linden/indra/llui/lluistring.h
index e52f718..4e9bb55 100644
--- a/linden/indra/llui/lluistring.h
+++ b/linden/indra/llui/lluistring.h
@@ -13,12 +13,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/lluixmltags.h b/linden/indra/llui/lluixmltags.h
index 84e571f..1afcb00 100644
--- a/linden/indra/llui/lluixmltags.h
+++ b/linden/indra/llui/lluixmltags.h
@@ -11,12 +11,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -120,4 +120,5 @@
 #define LL_JOYSTICK_TURN LLString("joystick_turn")
 #define LL_GROUP_DROP_TARGET_TAG LLString("group_drop_target")
 #define LL_LAYOUT_STACK_TAG LLString("layout_stack")
+#define LL_FLYOUT_BUTTON_TAG "flyout_button"
 #endif
diff --git a/linden/indra/llui/llundo.cpp b/linden/indra/llui/llundo.cpp
index 3580d31..a267ae2 100644
--- a/linden/indra/llui/llundo.cpp
+++ b/linden/indra/llui/llundo.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llundo.h b/linden/indra/llui/llundo.h
index b3e2457..2bf04bc 100644
--- a/linden/indra/llui/llundo.h
+++ b/linden/indra/llui/llundo.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index e18dbb0..04d33a6 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -13,12 +13,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -113,7 +113,7 @@ LLView::LLView() :
         mSaveToXML(TRUE),
         mIsFocusRoot(FALSE),
         mLastVisible(TRUE),
-        mSpanChildren(FALSE),
+        mUseBoundingRect(FALSE),
         mVisible(TRUE),
         mHidden(FALSE),
         mNextInsertionOrdinal(0)
@@ -133,7 +133,7 @@ LLView::LLView(const LLString& name, BOOL mouse_opaque) :
         mSaveToXML(TRUE),
         mIsFocusRoot(FALSE),
         mLastVisible(TRUE),
-        mSpanChildren(FALSE),
+        mUseBoundingRect(FALSE),
         mVisible(TRUE),
         mHidden(FALSE),
         mNextInsertionOrdinal(0)
@@ -148,6 +148,7 @@ LLView::LLView(
         mParentView(NULL),
         mName(name),
         mRect(rect),
+        mBoundingRect(rect),
         mReshapeFlags(reshape),
         mDefaultTabGroup(0),
         mEnabled(TRUE),
@@ -156,7 +157,7 @@ LLView::LLView(
         mSaveToXML(TRUE),
         mIsFocusRoot(FALSE),
         mLastVisible(TRUE),
-        mSpanChildren(FALSE),
+        mUseBoundingRect(FALSE),
         mVisible(TRUE),
         mHidden(FALSE),
         mNextInsertionOrdinal(0)
@@ -235,10 +236,16 @@ BOOL LLView::setToolTipArg(const LLStringExplicit& key, const LLStringExplicit&
         return TRUE;
 }
 
+void LLView::setToolTipArgs( const LLString::format_map_t& args )
+{
+        mToolTipMsg.setArgList(args);
+}
+
 // virtual
 void LLView::setRect(const LLRect& rect)
 {
         mRect = rect;
+        updateBoundingRect();
 }
 
 
@@ -287,9 +294,18 @@ void LLView::setName(LLString name)
         mName = name;
 }
 
-void LLView::setSpanChildren( BOOL span_children ) 
+void LLView::setUseBoundingRect( BOOL use_bounding_rect ) 
+{
+        if (mUseBoundingRect != use_bounding_rect)
+        {
+        mUseBoundingRect = use_bounding_rect; 
+                updateBoundingRect();
+        }
+}
+
+BOOL LLView::getUseBoundingRect()
 {
-        mSpanChildren = span_children; updateRect();
+        return mUseBoundingRect;
 }
 
 const LLString& LLView::getToolTip()
@@ -306,7 +322,7 @@ const LLString& LLView::getName() const
 
 void LLView::sendChildToFront(LLView* child)
 {
-        if (child->mParentView == this) 
+        if (child && child->getParent() == this) 
         {
                 mChildList.remove( child );
                 mChildList.push_front(child);
@@ -315,7 +331,7 @@ void LLView::sendChildToFront(LLView* child)
 
 void LLView::sendChildToBack(LLView* child)
 {
-        if (child->mParentView == this) 
+        if (child && child->getParent() == this) 
         {
                 mChildList.remove( child );
                 mChildList.push_back(child);
@@ -330,6 +346,14 @@ void LLView::moveChildToFrontOfTabGroup(LLUICtrl* child)
         }
 }
 
+void LLView::moveChildToBackOfTabGroup(LLUICtrl* child)
+{
+        if(mCtrlOrder.find(child) != mCtrlOrder.end())
+        {
+                mCtrlOrder[child].second = mNextInsertionOrdinal++;
+        }
+}
+
 void LLView::addChild(LLView* child, S32 tab_group)
 {
         if (mParentView == child) 
@@ -353,7 +377,7 @@ void LLView::addChild(LLView* child, S32 tab_group)
         }
 
         child->mParentView = this;
-        updateRect();
+        updateBoundingRect();
 }
 
 
@@ -380,7 +404,7 @@ void LLView::addChildAtEnd(LLView* child, S32 tab_group)
         }
         
         child->mParentView = this;
-        updateRect();
+        updateBoundingRect();
 }
 
 // remove the specified child from the view, and set it's parent to NULL.
@@ -403,6 +427,7 @@ void LLView::removeChild(LLView* child, BOOL deleteIt)
         {
                 llerrs << "LLView::removeChild called with non-child" << llendl;
         }
+        updateBoundingRect();
 }
 
 void LLView::addCtrlAtEnd(LLUICtrl* ctrl, S32 tab_group)
@@ -782,6 +807,7 @@ void LLView::setVisible(BOOL visible)
                         // tell all children of this view that the visibility may have changed
                         onVisibilityChange( visible );
                 }
+                updateBoundingRect();
         }
 }
 
@@ -815,6 +841,7 @@ void LLView::onVisibilityChange ( BOOL new_visibility )
 void LLView::translate(S32 x, S32 y)
 {
         mRect.translate(x, y);
+        updateBoundingRect();
 }
 
 // virtual
@@ -831,7 +858,8 @@ void LLView::snappedTo(LLView* snap_view)
 BOOL LLView::handleHover(S32 x, S32 y, MASK mask)
 {
         BOOL handled = childrenHandleHover( x, y, mask ) != NULL;
-        if( !handled && mMouseOpaque && pointInView( x, y ) )
+        if( !handled 
+                && blockMouseEvent(x, y) )
         {
                 LLUI::sWindow->setCursor(UI_CURSOR_ARROW);
                 lldebugst(LLERR_USER_INPUT) << "hover handled by " << getName() << llendl;
@@ -876,45 +904,46 @@ BOOL LLView::handleToolTip(S32 x, S32 y, LLString& msg, LLRect* sticky_rect_scre
 
     LLString tool_tip;
 
-        if ( getVisible() && getEnabled())
+        for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
         {
-                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                LLView* viewp = *child_it;
+                S32 local_x = x - viewp->mRect.mLeft;
+                S32 local_y = y - viewp->mRect.mBottom;
+                if( viewp->pointInView(local_x, local_y) 
+                        && viewp->getVisible() 
+                        && viewp->getEnabled()
+                        && viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ))
                 {
-                        LLView* viewp = *child_it;
-                        S32 local_x = x - viewp->mRect.mLeft;
-                        S32 local_y = y - viewp->mRect.mBottom;
-                        if( viewp->handleToolTip(local_x, local_y, msg, sticky_rect_screen ) )
-                        {
-                                handled = TRUE;
-                                break;
-                        }
+                        handled = TRUE;
+                        break;
                 }
+        }
 
-                tool_tip = mToolTipMsg.getString();
-                if (LLUI::sShowXUINames && (tool_tip.find(".xml", 0) == LLString::npos) && 
-                        (mName.find("Drag", 0) == LLString::npos))
-                {
-                        tool_tip = getShowNamesToolTip();
-                }
-                
+        tool_tip = mToolTipMsg.getString();
+        if (
+                LLUI::sShowXUINames &&
+                (tool_tip.find(".xml", 0) == LLString::npos) && 
+                (mName.find("Drag", 0) == LLString::npos))
+        {
+                tool_tip = getShowNamesToolTip();
+        }
 
-                BOOL showNamesTextBox = LLUI::sShowXUINames && (getWidgetType() == WIDGET_TYPE_TEXT_BOX);
+        BOOL showNamesTextBox = LLUI::sShowXUINames && (getWidgetType() == WIDGET_TYPE_TEXT_BOX);
 
-                if( !handled && (mMouseOpaque || showNamesTextBox) && pointInView( x, y ) && !tool_tip.empty())
-                {
+        if( !handled && (blockMouseEvent(x, y) || showNamesTextBox) && !tool_tip.empty())
+        {
 
-                        msg = tool_tip;
+                msg = tool_tip;
 
-                        // Convert rect local to screen coordinates
-                        localPointToScreen(
-                                0, 0,
-                                &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
-                        localPointToScreen(
-                                mRect.getWidth(), mRect.getHeight(),
-                                &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
-                        
-                        handled = TRUE;
-                }
+                // Convert rect local to screen coordinates
+                localPointToScreen(
+                        0, 0,
+                        &(sticky_rect_screen->mLeft), &(sticky_rect_screen->mBottom) );
+                localPointToScreen(
+                        mRect.getWidth(), mRect.getHeight(),
+                        &(sticky_rect_screen->mRight), &(sticky_rect_screen->mTop) );
+                
+                handled = TRUE;
         }
 
         return handled;
@@ -1025,7 +1054,7 @@ BOOL LLView::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
                                                                                         cargo_data,
                                                                                         accept,
                                                                                         tooltip_msg) != NULL;
-        if( !handled && mMouseOpaque )
+        if( !handled && blockMouseEvent(x, y) )
         {
                 *accept = ACCEPT_NO;
                 handled = TRUE;
@@ -1081,7 +1110,7 @@ BOOL LLView::hasMouseCapture()
 BOOL LLView::handleMouseUp(S32 x, S32 y, MASK mask)
 {
         BOOL handled = childrenHandleMouseUp( x, y, mask ) != NULL;
-        if( !handled && mMouseOpaque )
+        if( !handled && blockMouseEvent(x, y) )
         {
                 handled = TRUE;
         }
@@ -1092,7 +1121,7 @@ BOOL LLView::handleMouseDown(S32 x, S32 y, MASK mask)
 {
         LLView* handled_view = childrenHandleMouseDown( x, y, mask );
         BOOL handled = (handled_view != NULL);
-        if( !handled && mMouseOpaque )
+        if( !handled && blockMouseEvent(x, y) )
         {
                 handled = TRUE;
                 handled_view = this;
@@ -1118,7 +1147,7 @@ BOOL LLView::handleMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLView::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
         BOOL handled = childrenHandleDoubleClick( x, y, mask ) != NULL;
-        if( !handled && mMouseOpaque )
+        if( !handled && blockMouseEvent(x, y) )
         {
                 handleMouseDown(x, y, mask);
                 handled = TRUE;
@@ -1132,7 +1161,7 @@ BOOL LLView::handleScrollWheel(S32 x, S32 y, S32 clicks)
         if( getVisible() && mEnabled )
         {
                 handled = childrenHandleScrollWheel( x, y, clicks ) != NULL;
-                if( !handled && mMouseOpaque )
+                if( !handled && blockMouseEvent(x, y) )
                 {
                         handled = TRUE;
                 }
@@ -1143,7 +1172,7 @@ BOOL LLView::handleScrollWheel(S32 x, S32 y, S32 clicks)
 BOOL LLView::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
         BOOL handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
-        if( !handled && mMouseOpaque )
+        if( !handled && blockMouseEvent(x, y) )
         {
                 handled = TRUE;
         }
@@ -1153,7 +1182,7 @@ BOOL LLView::handleRightMouseDown(S32 x, S32 y, MASK mask)
 BOOL LLView::handleRightMouseUp(S32 x, S32 y, MASK mask)
 {
         BOOL handled = childrenHandleRightMouseUp( x, y, mask ) != NULL;
-        if( !handled && mMouseOpaque )
+        if( !handled && blockMouseEvent(x, y) )
         {
                 handled = TRUE;
         }
@@ -1428,10 +1457,10 @@ void LLView::draw()
                 focus_view = NULL;
         }
 
+        ++sDepth;
         for (child_list_reverse_iter_t child_iter = mChildList.rbegin(); child_iter != mChildList.rend(); ++child_iter)
         {
                 LLView *viewp = *child_iter;
-                ++sDepth;
 
                 if (viewp->getVisible() && viewp != focus_view)
                 {
@@ -1449,8 +1478,8 @@ void LLView::draw()
                         }
                 }
 
-                --sDepth;
         }
+        --sDepth;
 
         if (focus_view && focus_view->getVisible())
         {
@@ -1467,50 +1496,61 @@ void LLView::draw()
 //Draw a box for debugging.
 void LLView::drawDebugRect()
 {
-        // drawing solids requires texturing be disabled
-        LLGLSNoTexture no_texture;
-
-        // draw red rectangle for the border
-        LLColor4 border_color(0.f, 0.f, 0.f, 1.f);
-        if (sEditingUI)
+        LLUI::pushMatrix();
         {
-                border_color.mV[0] = 1.f;
-        }
-        else
-        {
-                border_color.mV[sDepth%3] = 1.f;
-        }
+                // drawing solids requires texturing be disabled
+                LLGLSNoTexture no_texture;
 
-        glColor4fv( border_color.mV );
+                if (mUseBoundingRect)
+                {
+                        LLUI::translate((F32)mBoundingRect.mLeft - (F32)mRect.mLeft, (F32)mBoundingRect.mBottom - (F32)mRect.mBottom, 0.f);
+                }
 
-        glBegin(GL_LINES);
-                glVertex2i(0, mRect.getHeight() - 1);
-                glVertex2i(0, 0);
+                LLRect debug_rect = mUseBoundingRect ? mBoundingRect : mRect;
 
-                glVertex2i(0, 0);
-                glVertex2i(mRect.getWidth() - 1, 0);
+                // draw red rectangle for the border
+                LLColor4 border_color(0.f, 0.f, 0.f, 1.f);
+                if (sEditingUI)
+                {
+                        border_color.mV[0] = 1.f;
+                }
+                else
+                {
+                        border_color.mV[sDepth%3] = 1.f;
+                }
 
-                glVertex2i(mRect.getWidth() - 1, 0);
-                glVertex2i(mRect.getWidth() - 1, mRect.getHeight() - 1);
+                glColor4fv( border_color.mV );
 
-                glVertex2i(mRect.getWidth() - 1, mRect.getHeight() - 1);
-                glVertex2i(0, mRect.getHeight() - 1);
-        glEnd();
+                glBegin(GL_LINES);
+                        glVertex2i(0, debug_rect.getHeight() - 1);
+                        glVertex2i(0, 0);
 
-        // Draw the name if it's not a leaf node
-        if (mChildList.size() && !sEditingUI)
-        {
-                //char temp[256];
-                S32 x, y;
-                glColor4fv( border_color.mV );
-                x = mRect.getWidth()/2;
-                y = mRect.getHeight()/2;
-                LLString debug_text = llformat("%s (%d x %d)", getName().c_str(),
-                                                                           mRect.getWidth(), mRect.getHeight());
-                LLFontGL::sSansSerifSmall->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
-                                                                                          LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL,
-                                                                                          S32_MAX, S32_MAX, NULL, FALSE);
+                        glVertex2i(0, 0);
+                        glVertex2i(debug_rect.getWidth() - 1, 0);
+
+                        glVertex2i(debug_rect.getWidth() - 1, 0);
+                        glVertex2i(debug_rect.getWidth() - 1, debug_rect.getHeight() - 1);
+
+                        glVertex2i(debug_rect.getWidth() - 1, debug_rect.getHeight() - 1);
+                        glVertex2i(0, debug_rect.getHeight() - 1);
+                glEnd();
+
+                // Draw the name if it's not a leaf node
+                if (mChildList.size() && !sEditingUI)
+                {
+                        //char temp[256];
+                        S32 x, y;
+                        glColor4fv( border_color.mV );
+                        x = debug_rect.getWidth()/2;
+                        y = debug_rect.getHeight()/2;
+                        LLString debug_text = llformat("%s (%d x %d)", getName().c_str(),
+                                                                                debug_rect.getWidth(), debug_rect.getHeight());
+                        LLFontGL::sSansSerifSmall->renderUTF8(debug_text, 0, (F32)x, (F32)y, border_color,
+                                                                                                LLFontGL::HCENTER, LLFontGL::BASELINE, LLFontGL::NORMAL,
+                                                                                                S32_MAX, S32_MAX, NULL, FALSE);
+                }
         }
+        LLUI::popMatrix();
 }
 
 void LLView::drawChild(LLView* childp, S32 x_offset, S32 y_offset, BOOL force_draw)
@@ -1537,9 +1577,6 @@ void LLView::drawChild(LLView* childp, S32 x_offset, S32 y_offset, BOOL force_dr
 
 void LLView::reshape(S32 width, S32 height, BOOL called_from_parent)
 {
-        // make sure this view contains all its children
-        updateRect();
-
         // compute how much things changed and apply reshape logic to children
         S32 delta_width = width - mRect.getWidth();
         S32 delta_height = height - mRect.getHeight();
@@ -1608,6 +1645,8 @@ void LLView::reshape(S32 width, S32 height, BOOL called_from_parent)
                         mParentView->reshape(mParentView->getRect().getWidth(), mParentView->getRect().getHeight(), FALSE);
                 }
         }
+
+        updateBoundingRect();
 }
 
 LLRect LLView::getRequiredRect()
@@ -1615,6 +1654,53 @@ LLRect LLView::getRequiredRect()
         return mRect;
 }
 
+void LLView::updateBoundingRect()
+{
+        if (isDead()) return;
+
+        if (mUseBoundingRect)
+        {
+                LLRect local_bounding_rect = LLRect::null;
+
+                child_list_const_iter_t child_it;
+                for ( child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+                {
+                        LLView* childp = *child_it;
+                        if (!childp->getVisible()) continue;
+
+                        LLRect child_bounding_rect = childp->getBoundingRect();
+
+                        if (local_bounding_rect.isNull())
+                        {
+                                // start out with bounding rect equal to first visible child's bounding rect
+                                local_bounding_rect = child_bounding_rect;
+                        }
+                        else
+                        {
+                                // accumulate non-null children rectangles
+                                if (!child_bounding_rect.isNull())
+                                {
+                                        local_bounding_rect.unionWith(child_bounding_rect);
+                                }
+                        }
+                }
+
+                mBoundingRect = local_bounding_rect;
+                // translate into parent-relative coordinates
+                mBoundingRect.translate(mRect.mLeft, mRect.mBottom);
+        }
+        else
+        {
+                mBoundingRect = mRect;
+        }
+
+        // give parent view a chance to resize, in case we just moved, for example
+        if (getParent() && getParent()->mUseBoundingRect)
+        {
+                getParent()->updateBoundingRect();
+        }
+}
+
 const LLRect LLView::getScreenRect() const
 {
         // *FIX: check for one-off error
@@ -1624,6 +1710,15 @@ const LLRect LLView::getScreenRect() const
         return screen_rect;
 }
 
+const LLRect LLView::getLocalBoundingRect() const
+{
+        LLRect local_bounding_rect = getBoundingRect();
+        local_bounding_rect.translate(-mRect.mLeft, -mRect.mBottom);
+
+        return local_bounding_rect;
+}
+
+
 const LLRect LLView::getLocalRect() const
 {
         LLRect local_rect(0, mRect.getHeight(), mRect.getWidth(), 0);
@@ -1637,38 +1732,7 @@ const LLRect LLView::getLocalSnapRect() const
         return local_snap_rect;
 }
 
-void LLView::updateRect()
-{
-        if (mSpanChildren && mChildList.size())
-        {
-                LLView* first_child = (*mChildList.begin());
-                LLRect child_spanning_rect = first_child->mRect;
-
-                for ( child_list_iter_t child_it = ++mChildList.begin(); child_it != mChildList.end(); ++child_it)
-                {
-                        LLView* viewp = *child_it;
-                        if (viewp->getVisible())
-                        {
-                                child_spanning_rect.unionWith(viewp->mRect);
-                        }
-                }
-
-                S32 translate_x = llmin(0, child_spanning_rect.mLeft);
-                S32 translate_y = llmin(0, child_spanning_rect.mBottom);
-                S32 new_width   = llmax(mRect.getWidth() + translate_x, child_spanning_rect.getWidth());
-                S32 new_height  = llmax(mRect.getHeight() + translate_y, child_spanning_rect.getHeight());
-
-                mRect.setOriginAndSize(mRect.mLeft + translate_x, mRect.mBottom + translate_y, new_width, new_height);
-
-                for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
-                {
-                        LLView* viewp = *child_it;
-                        viewp->mRect.translate(-translate_x, -translate_y);
-                }
-        }
-}
-
-BOOL LLView::hasAncestor(LLView* parentp)
+BOOL LLView::hasAncestor(const LLView* parentp)
 {
         if (!parentp)
         {
@@ -1743,14 +1807,23 @@ LLView* LLView::getChildByName(const LLString& name, BOOL recurse) const
         return NULL;
 }
 
-// virtual
-void LLView::onFocusLost()
-{
+BOOL LLView::parentPointInView(S32 x, S32 y, EHitTestType type) const 
+{ 
+        return (mUseBoundingRect && type == HIT_TEST_USE_BOUNDING_RECT)
+                ? mBoundingRect.pointInRect( x, y ) 
+                : mRect.pointInRect( x, y ); 
 }
 
-// virtual
-void LLView::onFocusReceived()
+BOOL LLView::pointInView(S32 x, S32 y, EHitTestType type) const 
+{ 
+        return (mUseBoundingRect && type == HIT_TEST_USE_BOUNDING_RECT)
+                ? mBoundingRect.pointInRect( x + mRect.mLeft, y + mRect.mBottom ) 
+                : mRect.localPointInRect( x, y ); 
+}
+
+BOOL LLView::blockMouseEvent(S32 x, S32 y) const
 {
+        return mMouseOpaque && pointInView(x, y, HIT_TEST_IGNORE_BOUNDING_RECT);
 }
 
 // virtual
@@ -2024,9 +2097,9 @@ LLXMLNodePtr LLView::getXML(bool save_children) const
         // Export all widgets as enabled and visible - code must disable.
         node->createChild("hidden", TRUE)->setBoolValue(mHidden);
         node->createChild("mouse_opaque", TRUE)->setBoolValue(mMouseOpaque );
-        if (!mToolTipMsg.empty())
+        if (!mToolTipMsg.getString().empty())
         {
-                node->createChild("tool_tip", TRUE)->setStringValue(mToolTipMsg);
+                node->createChild("tool_tip", TRUE)->setStringValue(mToolTipMsg.getString());
         }
         if (mSoundFlags != MOUSE_UP)
         {
@@ -2116,7 +2189,7 @@ const LLCtrlQuery & LLView::getTabOrderQuery()
                 query.addPreFilter(LLVisibleFilter::getInstance());
                 query.addPreFilter(LLEnabledFilter::getInstance());
                 query.addPreFilter(LLTabStopFilter::getInstance());
-                query.addPostFilter(LLUICtrl::LLTabStopPostFilter::getInstance());
+                query.addPostFilter(LLLeavesFilter::getInstance());
         }
         return query;
 }
@@ -2129,6 +2202,7 @@ const LLCtrlQuery & LLView::getFocusRootsQuery()
                 query.addPreFilter(LLVisibleFilter::getInstance());
                 query.addPreFilter(LLEnabledFilter::getInstance());
                 query.addPreFilter(LLView::LLFocusRootsFilter::getInstance());
+                query.addPostFilter(LLRootsFilter::getInstance());
         }
         return query;
 }
@@ -2593,10 +2667,10 @@ const S32 VPAD = 4;
 U32 LLView::createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, const LLRect &required_rect)
 {
         U32 follows = 0;
-        S32 x = FLOATER_H_MARGIN;
-        S32 y = 0;
-        S32 w = 0;
-        S32 h = 0;
+        S32 x = rect.mLeft;
+        S32 y = rect.mBottom;
+        S32 w = rect.getWidth();
+        S32 h = rect.getHeight();
 
         U32 last_x = 0;
         U32 last_y = 0;
@@ -2639,8 +2713,15 @@ U32 LLView::createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, con
         // view if you don't specify a width.
         if (parent_view)
         {
-                w = llmax(required_rect.getWidth(), parent_view->getRect().getWidth() - (FLOATER_H_MARGIN) - x);
-                h = llmax(MIN_WIDGET_HEIGHT, required_rect.getHeight());
+                if(w == 0)
+                {
+                        w = llmax(required_rect.getWidth(), parent_view->getRect().getWidth() - (FLOATER_H_MARGIN) - x);
+                }
+
+                if(h == 0)
+                {
+                        h = llmax(MIN_WIDGET_HEIGHT, required_rect.getHeight());
+                }
         }
 
         if (node->hasAttribute("width"))
@@ -2765,44 +2846,7 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
         setRect(view_rect);
         setFollows(follows_flags);
 
-        if (node->hasAttribute("follows"))
-        {
-                setFollowsNone();
-
-                LLString follows;
-                node->getAttributeString("follows", follows);
-
-                typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
-                boost::char_separator<char> sep("|");
-                tokenizer tokens(follows, sep);
-                tokenizer::iterator token_iter = tokens.begin();
-
-                while(token_iter != tokens.end())
-                {
-                        const std::string& token_str = *token_iter;
-                        if (token_str == "left")
-                        {
-                                setFollowsLeft();
-                        }
-                        else if (token_str == "right")
-                        {
-                                setFollowsRight();
-                        }
-                        else if (token_str == "top")
-                        {
-                                setFollowsTop();
-                        }
-                        else if (token_str == "bottom")
-                        {
-                                setFollowsBottom();
-                        }
-                        else if (token_str == "all")
-                        {
-                                setFollowsAll();
-                        }
-                        ++token_iter;
-                }
-        }
+        parseFollowsFlags(node);
 
         if (node->hasAttribute("control_name"))
         {
@@ -2839,11 +2883,57 @@ void LLView::initFromXML(LLXMLNodePtr node, LLView* parent)
                 setHidden(hidden);
         }
 
+        node->getAttributeBOOL("use_bounding_rect", mUseBoundingRect);
+        node->getAttributeBOOL("mouse_opaque", mMouseOpaque);
+
         node->getAttributeS32("default_tab_group", mDefaultTabGroup);
         
         reshape(view_rect.getWidth(), view_rect.getHeight());
 }
 
+void LLView::parseFollowsFlags(LLXMLNodePtr node)
+{
+        if (node->hasAttribute("follows"))
+        {
+                setFollowsNone();
+
+                LLString follows;
+                node->getAttributeString("follows", follows);
+
+                typedef boost::tokenizer<boost::char_separator<char> > tokenizer;
+                boost::char_separator<char> sep("|");
+                tokenizer tokens(follows, sep);
+                tokenizer::iterator token_iter = tokens.begin();
+
+                while(token_iter != tokens.end())
+                {
+                        const std::string& token_str = *token_iter;
+                        if (token_str == "left")
+                        {
+                                setFollowsLeft();
+                        }
+                        else if (token_str == "right")
+                        {
+                                setFollowsRight();
+                        }
+                        else if (token_str == "top")
+                        {
+                                setFollowsTop();
+                        }
+                        else if (token_str == "bottom")
+                        {
+                                setFollowsBottom();
+                        }
+                        else if (token_str == "all")
+                        {
+                                setFollowsAll();
+                        }
+                        ++token_iter;
+                }
+        }
+}
+
+
 // static
 LLFontGL* LLView::selectFont(LLXMLNodePtr node)
 {
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index bd99a13..67a4d56 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -50,6 +50,7 @@
 #include "llviewquery.h"
 #include "llxmlnode.h"
 #include "stdenums.h"
+#include "lluistring.h"
 
 class LLColor4;
 class LLWindow;
@@ -146,6 +147,7 @@ protected:
         LLString        mName;
         // location in pixels, relative to surrounding structure, bottom,left=0,0
         LLRect          mRect;
+        LLRect          mBoundingRect;
         
         U32                     mReshapeFlags;
 
@@ -161,11 +163,11 @@ protected:
         BOOL            mSaveToXML;
 
         BOOL            mIsFocusRoot;
+        BOOL            mUseBoundingRect; // hit test against bounding rectangle that includes all child elements
 
 public:
         LLViewHandle mViewHandle;
         BOOL            mLastVisible;
-        BOOL            mSpanChildren;
 
 private:
         BOOL            mVisible;
@@ -217,6 +219,7 @@ public:
         void            setMouseOpaque( BOOL b );
         void            setToolTip( const LLStringExplicit& msg );
         BOOL            setToolTipArg( const LLStringExplicit& key, const LLStringExplicit& text );
+        void            setToolTipArgs( const LLString::format_map_t& args );
 
         virtual void setRect(const LLRect &rect);
         void            setFollows(U32 flags);
@@ -231,13 +234,15 @@ public:
 
         void        setSoundFlags(U8 flags);
         void            setName(LLString name);
-        void            setSpanChildren( BOOL span_children );
+        void            setUseBoundingRect( BOOL use_bounding_rect );
+        BOOL            getUseBoundingRect();
 
         const LLString& getToolTip();
 
         void            sendChildToFront(LLView* child);
         void            sendChildToBack(LLView* child);
         void            moveChildToFrontOfTabGroup(LLUICtrl* child);
+        void            moveChildToBackOfTabGroup(LLUICtrl* child);
 
         void            addChild(LLView* view, S32 tab_group = 0);
         void            addChildAtEnd(LLView* view,  S32 tab_group = 0);
@@ -264,7 +269,7 @@ public:
         {
                 /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const 
                 {
-                        return filterResult_t(view->isCtrl() && view->isFocusRoot(), !view->isFocusRoot());
+                        return filterResult_t(view->isCtrl() && view->isFocusRoot(), TRUE);
                 }
         };
 
@@ -312,20 +317,22 @@ public:
         BOOL            followsAll() const                              { return mReshapeFlags & FOLLOWS_ALL; }
 
         const LLRect&   getRect() const                         { return mRect; }
+        const LLRect&   getBoundingRect() const         { return mBoundingRect; }
+        const LLRect    getLocalBoundingRect() const;
         const LLRect    getScreenRect() const;
         const LLRect    getLocalRect() const;
         virtual const LLRect getSnapRect() const        { return mRect; }
         virtual const LLRect getLocalSnapRect() const;
 
         virtual LLRect getRequiredRect();               // Get required size for this object. 0 for width/height means don't care.
-        virtual void updateRect();                              // apply procedural updates to own rectangle
+        void updateBoundingRect();
 
         LLView*         getRootView();
         LLView*         getParent() const                               { return mParentView; }
         LLView*         getFirstChild()                                 { return (mChildList.empty()) ? NULL : *(mChildList.begin()); }
         S32                     getChildCount() const                   { return (S32)mChildList.size(); }
         template<class _Pr3> void sortChildren(_Pr3 _Pred) { mChildList.sort(_Pred); }
-        BOOL            hasAncestor(LLView* parentp);
+        BOOL            hasAncestor(const LLView* parentp);
 
         BOOL            hasChild(const LLString& childname, BOOL recurse = FALSE) const;
 
@@ -390,6 +397,7 @@ public:
 
         static U32 createRect(LLXMLNodePtr node, LLRect &rect, LLView* parent_view, const LLRect &required_rect = LLRect());
         virtual void initFromXML(LLXMLNodePtr node, LLView* parent);
+        void parseFollowsFlags(LLXMLNodePtr node);
 
         static LLFontGL* selectFont(LLXMLNodePtr node);
         static LLFontGL::HAlign selectFontHAlign(LLXMLNodePtr node);
@@ -428,12 +436,16 @@ public:
         BOOL                    getVisible() const                      { return mVisible && !mHidden; }
         U8              getSoundFlags() const       { return mSoundFlags; }
 
-        // Default to no action
-        virtual void    onFocusLost();
-        virtual void    onFocusReceived();
+        typedef enum e_hit_test_type
+        {
+                HIT_TEST_USE_BOUNDING_RECT,
+                HIT_TEST_IGNORE_BOUNDING_RECT
+        }EHitTestType;
+
+        BOOL                    parentPointInView(S32 x, S32 y, EHitTestType type = HIT_TEST_USE_BOUNDING_RECT) const;
+        BOOL                    pointInView(S32 x, S32 y, EHitTestType type = HIT_TEST_USE_BOUNDING_RECT) const;
+        BOOL                    blockMouseEvent(S32 x, S32 y) const;
 
-        BOOL                    parentPointInView(S32 x, S32 y) const { return mRect.pointInRect( x, y ); }
-        BOOL                    pointInView(S32 x, S32 y) const { return mRect.localPointInRect( x, y ); }
         virtual void    screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const;
         virtual void    localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const;
         virtual BOOL    localPointToOtherView( S32 x, S32 y, S32 *other_x, S32 *other_y, LLView* other_view);
diff --git a/linden/indra/llui/llviewborder.cpp b/linden/indra/llui/llviewborder.cpp
index f2ff8a3..b70edec 100644
--- a/linden/indra/llui/llviewborder.cpp
+++ b/linden/indra/llui/llviewborder.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -84,7 +84,7 @@ void LLViewBorder::setColorsExtended( const LLColor4& shadow_light, const LLColo
 
 void LLViewBorder::setTexture( const LLUUID &image_id )
 {
-        mTexture = LLUI::sImageProvider->getUIImageByID(image_id);
+        mTexture = LLUI::sImageProvider->getImageByID(image_id);
 }
 
 
diff --git a/linden/indra/llui/llviewborder.h b/linden/indra/llui/llviewborder.h
index 935257c..d9c2916 100644
--- a/linden/indra/llui/llviewborder.h
+++ b/linden/indra/llui/llviewborder.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
diff --git a/linden/indra/llui/llviewquery.cpp b/linden/indra/llui/llviewquery.cpp
index f86f855..40c2d61 100644
--- a/linden/indra/llui/llviewquery.cpp
+++ b/linden/indra/llui/llviewquery.cpp
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -37,9 +37,14 @@
 
 void LLQuerySorter::operator() (LLView * parent, viewList_t &children) const {}
 
-filterResult_t LLNoLeavesFilter::operator() (const LLView* const view, const viewList_t & children) const 
+filterResult_t LLLeavesFilter::operator() (const LLView* const view, const viewList_t & children) const 
 {
-        return filterResult_t(!(view->getChildList()->size() == 0), TRUE);
+        return filterResult_t(children.empty(), TRUE);
+}
+
+filterResult_t LLRootsFilter::operator() (const LLView* const view, const viewList_t & children) const 
+{
+        return filterResult_t(TRUE, FALSE);
 }
 
 filterResult_t LLVisibleFilter::operator() (const LLView* const view, const viewList_t & children) const 
@@ -56,6 +61,16 @@ filterResult_t LLTabStopFilter::operator() (const LLView* const view, const view
                                                 view->canFocusChildren());
 }
 
+filterResult_t LLCtrlFilter::operator() (const LLView* const view, const viewList_t & children) const 
+{
+        return filterResult_t(view->isCtrl(),TRUE);
+}
+
+filterResult_t LLWidgetTypeFilter::operator() (const LLView* const view, const viewList_t & children) const
+{
+        return filterResult_t(view->getWidgetType() == mType, TRUE);
+} 
+
 // LLViewQuery
 
 LLViewQuery::LLViewQuery(): mPreFilters(), mPostFilters(), mSorterp() 
@@ -73,45 +88,53 @@ const LLViewQuery::filterList_t & LLViewQuery::getPostFilters() const { return m
 void LLViewQuery::setSorter(const LLQuerySorter* sorterp) { mSorterp = sorterp; }
 const LLQuerySorter* LLViewQuery::getSorter() const { return mSorterp; }
 
-viewList_t LLViewQuery::run(LLView * view) const
+viewList_t LLViewQuery::run(LLView* view) const
 {
         viewList_t result;
 
-        filterResult_t pre = runFilters(view, viewList_t(), mPreFilters);
+        // prefilter gets immediate children of view
+        filterResult_t pre = runFilters(view, *view->getChildList(), mPreFilters);
         if(!pre.first && !pre.second)
         {
-                // skip post filters completely if we're not including ourselves or the children
+                // not including ourselves or the children
+                // nothing more to do
                 return result;
         }
+
+        viewList_t filtered_children;
+        filterResult_t post(TRUE, TRUE);
         if(pre.second)
         {
                 // run filters on children
-                viewList_t filtered_children;
                 filterChildren(view, filtered_children);
-                filterResult_t post = runFilters(view, filtered_children, mPostFilters);
-                if(pre.first && post.first)
-                {
-                        result.push_back(view);
-                }
-                if(post.second)
+                // only run post filters if this element passed pre filters
+                // so if you failed to pass the pre filter, you can't filter out children in post
+                if (pre.first)
                 {
-                        result.insert(result.end(), filtered_children.begin(), filtered_children.end());
+                        post = runFilters(view, filtered_children, mPostFilters);
                 }
         }
-        else 
+
+        if(pre.first && post.first) 
         {
-                if(pre.first) 
-                {
-                        result.push_back(view);
-                }
+                result.push_back(view);
+        }
+
+        if(pre.second && post.second)
+        {
+                result.insert(result.end(), filtered_children.begin(), filtered_children.end());
         }
+
         return result;
 }
 
 void LLViewQuery::filterChildren(LLView * view, viewList_t & filtered_children) const
 {
         LLView::child_list_t views(*(view->getChildList()));
-        (*mSorterp)(view, views); // sort the children per the sorter
+        if (mSorterp)
+        {
+                (*mSorterp)(view, views); // sort the children per the sorter
+        }
         for(LLView::child_list_iter_t iter = views.begin();
                         iter != views.end();
                         iter++)
diff --git a/linden/indra/llui/llviewquery.h b/linden/indra/llui/llviewquery.h
index 9fe51a4..2e2b50d 100644
--- a/linden/indra/llui/llviewquery.h
+++ b/linden/indra/llui/llviewquery.h
@@ -12,12 +12,12 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlife.com/developers/opensource/gplv2
+ * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlife.com/developers/opensource/flossexception
+ * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -35,6 +35,7 @@
 #include <list> 
 
 #include "llmemory.h"
+#include "llui.h"
 
 class LLView;
 
@@ -42,35 +43,60 @@ typedef std::list<LLView *>			viewList_t;
 typedef std::pair<BOOL, BOOL>           filterResult_t;
 
 // Abstract base class for all filters.
-class LLQueryFilter : public LLRefCount
+class LLQueryFilter
 {
 public:
+        virtual ~LLQueryFilter() {};
         virtual filterResult_t operator() (const LLView* const view, const viewList_t & children) const =0;
 };
 
-class LLQuerySorter : public LLRefCount
+class LLQuerySorter
 {
 public:
+        virtual ~LLQuerySorter() {};
         virtual void operator() (LLView * parent, viewList_t &children) const;
 };
 
-class LLNoLeavesFilter : public LLQueryFilter, public LLSingleton<LLNoLeavesFilter>
+class LLLeavesFilter : public LLQueryFilter, public LLSingleton<LLLeavesFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+
+class LLRootsFilter : public LLQueryFilter, public LLSingleton<LLRootsFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+
 class LLVisibleFilter : public LLQueryFilter, public LLSingleton<LLVisibleFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+
 class LLEnabledFilter : public LLQueryFilter, public LLSingleton<LLEnabledFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
+
 class LLTabStopFilter : public LLQueryFilter, public LLSingleton<LLTabStopFilter>
 {
         /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
 };
 
+class LLCtrlFilter : public LLQueryFilter, public LLSingleton<LLCtrlFilter>
+{
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+};
+
+class LLWidgetTypeFilter : public LLQueryFilter
+{
+public:
+        LLWidgetTypeFilter(EWidgetType type) : mType(type) {};
+private:
+        /*virtual*/ filterResult_t operator() (const LLView* const view, const viewList_t & children) const;
+
+        EWidgetType mType;
+};
+
 // Algorithm for flattening
 class LLViewQuery
 {