Second Life viewer sources 1.23.0-RC

1 files changed, 29 insertions, 10 deletions

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 3aec2ee..28a05c1 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -17,7 +17,8 @@
  * 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://secondlifegrid.net/programs/open_source/licensing/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,11 +73,12 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mTextEntryTentative(TRUE),
         mListPosition(BELOW),
         mPrearrangeCallback( NULL ),
-        mTextEntryCallback( NULL )
+        mTextEntryCallback( NULL ),
+        mLabel(label)
 {
         // Always use text box 
         // Text label button
-        mButton = new LLButton(label,
+        mButton = new LLButton(mLabel,
                                                                 LLRect(), 
                                                                 LLStringUtil::null,
                                                                 NULL, this);
@@ -87,7 +89,7 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mButton->setScaleImage(TRUE);
 
         mButton->setMouseDownCallback(onButtonDown);
-        mButton->setFont(LLFontGL::sSansSerifSmall);
+        mButton->setFont(LLFontGL::getFontSansSerifSmall());
         mButton->setFollows(FOLLOWS_LEFT | FOLLOWS_BOTTOM | FOLLOWS_RIGHT);
         mButton->setHAlign( LLFontGL::LEFT );
         mButton->setRightHPad(2);
@@ -197,7 +199,12 @@ LLView* LLComboBox::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *
                 }
         }
 
-        combo_box->selectFirstItem();
+        // if providing user text entry or descriptive label
+        // don't select an item under the hood
+        if (!combo_box->acceptsTextInput() && combo_box->mLabel.empty())
+        {
+                combo_box->selectFirstItem();
+        }
 
         return combo_box;
 }
@@ -259,7 +266,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, EAddPosition pos, BOO
 {
         LLScrollListItem* item = mList->addSimpleElement(name, pos);
         item->setEnabled(enabled);
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -268,7 +278,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, const LLUUID& id, EAd
 {
         LLScrollListItem* item = mList->addSimpleElement(name, pos, id);
         item->setEnabled(enabled);
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -278,7 +291,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, void* userdata, EAddP
         LLScrollListItem* item = mList->addSimpleElement(name, pos);
         item->setEnabled(enabled);
         item->setUserdata( userdata );
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -287,7 +303,10 @@ LLScrollListItem* LLComboBox::add(const std::string& name, LLSD value, EAddPosit
 {
         LLScrollListItem* item = mList->addSimpleElement(name, pos, value);
         item->setEnabled(enabled);
-        mList->selectFirstItem();
+        if (!mAllowTextEntry && mLabel.empty())
+        {
+                selectFirstItem();
+        }
         return item;
 }
 
@@ -498,7 +517,7 @@ void LLComboBox::updateLayout()
                         mTextEntry = new LLLineEditor(std::string("combo_text_entry"),
                                                                                 text_entry_rect,
                                                                                 LLStringUtil::null,
-                                                                                LLFontGL::sSansSerifSmall,
+                                                                                LLFontGL::getFontSansSerifSmall(),
                                                                                 mMaxChars,
                                                                                 onTextCommit,
                                                                                 onTextEntry,