10 files changed, 58 insertions, 92 deletions

diff --git a/linden/indra/llui/llbutton.cpp b/linden/indra/llui/llbutton.cpp
index 9fa1c8e..7513fc2 100644
--- a/linden/indra/llui/llbutton.cpp
+++ b/linden/indra/llui/llbutton.cpp
@@ -956,37 +956,37 @@ S32 round_up(S32 grid, S32 value)
 
 void                    LLButton::setImageUnselected(const LLString &image_name)
 {       
-        setImageUnselected(LLUI::getUIImageByName(image_name));
+        setImageUnselected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageUnselectedName = image_name;
 }
 
 void                    LLButton::setImageSelected(const LLString &image_name)
 {       
-        setImageSelected(LLUI::getUIImageByName(image_name));
+        setImageSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageSelectedName = image_name;
 }
 
 void                    LLButton::setImageHoverSelected(const LLString &image_name)
 {
-        setImageHoverSelected(LLUI::getUIImageByName(image_name));
+        setImageHoverSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageHoverSelectedName = image_name;
 }
 
 void                    LLButton::setImageHoverUnselected(const LLString &image_name)
 {
-        setImageHoverUnselected(LLUI::getUIImageByName(image_name));
+        setImageHoverUnselected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageHoverUnselectedName = image_name;
 }
 
 void                    LLButton::setImageDisabled(const LLString &image_name)
 {
-        setImageDisabled(LLUI::getUIImageByName(image_name));
+        setImageDisabled(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageDisabledName = image_name;
 }
 
 void                    LLButton::setImageDisabledSelected(const LLString &image_name)
 {
-        setImageDisabledSelected(LLUI::getUIImageByName(image_name));
+        setImageDisabledSelected(image_name.empty() ? NULL : LLUI::getUIImageByName(image_name));
         mImageDisabledSelectedName = image_name;
 }
 
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 96092b4..0e0f5f2 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -1086,6 +1086,10 @@ BOOL LLComboBox::operateOnAll(EOperation op)
         return FALSE;
 }
 
+BOOL LLComboBox::selectItemRange( S32 first, S32 last )
+{
+        return mList->selectItemRange(first, last);
+}
 
 
 //
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index 7511449..db1c251 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -156,7 +156,7 @@ public:
         virtual BOOL    getCanSelect() const                            { return TRUE; }
         virtual BOOL    selectFirstItem()                                       { return setCurrentByIndex(0); }
         virtual BOOL    selectNthItem( S32 index )                      { return setCurrentByIndex(index); }
-        virtual BOOL    selectItemRange( S32 first, S32 last ) { return setCurrentByIndex(first); }
+        virtual BOOL    selectItemRange( S32 first, S32 last );
         virtual S32             getFirstSelectedIndex() const           { return getCurrentIndex(); }
         virtual BOOL    setCurrentByID( const LLUUID& id );
         virtual LLUUID  getCurrentID();                         // LLUUID::null if no items in menu
diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 496b67f..6d86652 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -1434,21 +1434,7 @@ void LLFloater::draw()
                         }
                 }
 
-                if( mDefaultBtn)
-                {
-                        if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
-                        {
-                                LLUICtrl* focus_ctrl = gFocusMgr.getKeyboardFocus();
-                                // is this button a direct descendent and not a nested widget (e.g. checkbox)?
-                                BOOL focus_is_child_button = focus_ctrl->getWidgetType() == WIDGET_TYPE_BUTTON && focus_ctrl->getParent() == this;
-                                // only enable default button when current focus is not a button
-                                mDefaultBtn->setBorderEnabled(!focus_is_child_button);
-                        }
-                        else
-                        {
-                                mDefaultBtn->setBorderEnabled(FALSE);
-                        }
-                }
+                LLPanel::updateDefaultBtn();
 
                 // draw children
                 LLView* focused_child = gFocusMgr.getKeyboardFocus();
@@ -1459,6 +1445,7 @@ void LLFloater::draw()
                         focused_child->setVisible(FALSE);
                 }
 
+                // don't call LLPanel::draw() since we've implemented custom background rendering
                 LLView::draw();
 
                 if( mBgVisible )
diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index 88c8d75..b091bb7 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -2418,6 +2418,12 @@ void LLLineEditor::resetPreedit()
 {
         if (hasPreeditString())
         {
+                if (hasSelection())
+                {
+                        llwarns << "Preedit and selection!" << llendl;
+                        deselect();
+                }
+
                 const S32 preedit_pos = mPreeditPositions.front();
                 mText.erase(preedit_pos, mPreeditPositions.back() - preedit_pos);
                 mText.insert(preedit_pos, mPreeditOverwrittenWString);
@@ -2427,11 +2433,10 @@ void LLLineEditor::resetPreedit()
                 mPreeditOverwrittenWString.clear();
                 mPreeditPositions.clear();
 
-                mKeystrokeTimer.reset();
-                if (mKeystrokeCallback)
-                {
-                        mKeystrokeCallback(this, mCallbackUserData);
-                }
+                // Don't reset key stroke timer nor invoke keystroke callback,
+                // because a call to updatePreedit should be follow soon in 
+                // normal course of operation, and timer and callback will be 
+                // maintained there.  Doing so here made an odd sound.  (VWR-3410) 
         }
 }
 
@@ -2444,27 +2449,10 @@ void LLLineEditor::updatePreedit(const LLWString &preedit_string,
                 return;
         }
 
-        if (hasSelection())
-        {
-                if (hasPreeditString())
-                {
-                        llwarns << "Preedit and selection!" << llendl;
-                        deselect();
-                }
-                else
-                {
-                        deleteSelection();
-                }
-        }
+        // Note that call to updatePreedit is always preceeded by resetPreedit,
+        // so we have no existing selection/preedit.
 
         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);
diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 7430e50..b72e104 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -214,6 +214,17 @@ void LLPanel::draw()
                 }
         }
 
+        updateDefaultBtn();
+
+        LLView::draw();
+}
+
+void LLPanel::updateDefaultBtn()
+{
+        // This method does not call LLView::draw() so callers will need
+        // to take care of that themselves at the appropriate place in
+        // their rendering sequence
+
         if( mDefaultBtn)
         {
                 if (gFocusMgr.childHasKeyboardFocus( this ) && mDefaultBtn->getEnabled())
@@ -228,8 +239,6 @@ void LLPanel::draw()
                         mDefaultBtn->setBorderEnabled(FALSE);
                 }
         }
-
-        LLView::draw();
 }
 
 void LLPanel::refresh()
diff --git a/linden/indra/llui/llpanel.h b/linden/indra/llui/llpanel.h
index bcbda2c..aeba6d9 100644
--- a/linden/indra/llui/llpanel.h
+++ b/linden/indra/llui/llpanel.h
@@ -119,6 +119,7 @@ public:
         void                    setBackgroundOpaque(BOOL b)             { mBgOpaque = b; }
         void                    setDefaultBtn(LLButton* btn = NULL);
         void                    setDefaultBtn(const LLString& id);
+        void                    updateDefaultBtn();
         void                    setLabel(const LLStringExplicit& label) { mLabel = label; }
         LLString                getLabel() const { return mLabel; }
         
diff --git a/linden/indra/llui/llscrolllistctrl.cpp b/linden/indra/llui/llscrolllistctrl.cpp
index 36a7b00..043caa9 100644
--- a/linden/indra/llui/llscrolllistctrl.cpp
+++ b/linden/indra/llui/llscrolllistctrl.cpp
@@ -220,22 +220,14 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
 :       LLScrollListCell(width),
         mText( text ),
         mFont( font ),
+        mColor(color),
+        mUseColor(use_color),
         mFontStyle( font_style ),
         mFontAlignment( font_alignment ),
         mVisible( visible ),
         mHighlightCount( 0 ),
         mHighlightOffset( 0 )
 {
-        if (use_color)
-        {
-                mColor = new LLColor4();
-                mColor->setVec(color);
-        }
-        else
-        {
-                mColor = NULL;
-        }
-
         sCount++;
 
         // initialize rounded rect image
@@ -248,7 +240,6 @@ LLScrollListText::LLScrollListText( const LLString& text, const LLFontGL* font,
 LLScrollListText::~LLScrollListText()
 {
         sCount--;
-        delete mColor;
 }
 
 S32     LLScrollListText::getContentWidth() const
@@ -259,11 +250,8 @@ S32	LLScrollListText::getContentWidth() const
 
 void LLScrollListText::setColor(const LLColor4& color)
 {
-        if (!mColor)
-        {
-                mColor = new LLColor4();
-        }
-        *mColor = color;
+        mColor = color;
+        mUseColor = TRUE;
 }
 
 void LLScrollListText::setText(const LLStringExplicit& text)
@@ -273,14 +261,14 @@ void LLScrollListText::setText(const LLStringExplicit& text)
 
 void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_color) const
 {
-        const LLColor4* display_color;
-        if (mColor)
+        LLColor4 display_color;
+        if (mUseColor)
         {
                 display_color = mColor;
         }
         else
         {
-                display_color = &color;
+                display_color = color;
         }
 
         if (mHighlightCount > 0)
@@ -327,7 +315,7 @@ void LLScrollListText::draw(const LLColor4& color, const LLColor4& highlight_col
         }
         mFont->render(mText.getWString(), 0, 
                                                 start_x, 2.f,
-                                                *display_color,
+                                                display_color,
                                                 mFontAlignment,
                                                 LLFontGL::BOTTOM, 
                                                 mFontStyle,
@@ -1070,7 +1058,7 @@ BOOL LLScrollListCtrl::selectItemRange( S32 first_index, S32 last_index )
                 {
                         if( itemp->getEnabled() )
                         {
-                                selectItem(itemp);
+                                selectItem(itemp, FALSE);
                                 success = TRUE;
                                 if (!success)
                                         mOriginalSelection = first_index;
diff --git a/linden/indra/llui/llscrolllistctrl.h b/linden/indra/llui/llscrolllistctrl.h
index 71ba63d..e9486cb 100644
--- a/linden/indra/llui/llscrolllistctrl.h
+++ b/linden/indra/llui/llscrolllistctrl.h
@@ -111,7 +111,8 @@ public:
 private:
         LLUIString              mText;
         const LLFontGL* mFont;
-        LLColor4*               mColor;
+        LLColor4                mColor;
+        U8                              mUseColor;
         U8                              mFontStyle;
         LLFontGL::HAlign mFontAlignment;
         BOOL                    mVisible;
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index ca9ea0a..9061ca3 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -4439,6 +4439,12 @@ void LLTextEditor::resetPreedit()
 {
         if (hasPreeditString())
         {
+                if (hasSelection())
+                {
+                        llwarns << "Preedit and selection!" << llendl;
+                        deselect();
+                }
+
                 mCursorPos = mPreeditPositions.front();
                 removeStringNoUndo(mCursorPos, mPreeditPositions.back() - mCursorPos);
                 insertStringNoUndo(mCursorPos, mPreeditOverwrittenWString);
@@ -4447,9 +4453,10 @@ void LLTextEditor::resetPreedit()
                 mPreeditOverwrittenWString.clear();
                 mPreeditPositions.clear();
 
-                updateLineStartList();
-                setCursorPos(mCursorPos);
-                // updateScrollFromCursor();
+                // A call to updatePreedit should soon follow under a
+                // normal course of operation, so we don't need to 
+                // maintain internal variables such as line start 
+                // positions now.
         }
 }
 
@@ -4462,28 +4469,9 @@ void LLTextEditor::updatePreedit(const LLWString &preedit_string,
                 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);