Fixes http://redmine.kokuaviewer.org/issues/585

3 files changed, 7 insertions, 5 deletions

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index f3ef83e..9b86486 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -75,7 +75,8 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mListPosition(BELOW),
         mPrearrangeCallback( NULL ),
         mTextEntryCallback( NULL ),
-        mLabel(label)
+        mLabel(label),
+        mListColor(LLUI::sColorsGroup->getColor("ComboBoxBg"))
 {
         if (font)
         {
@@ -109,7 +110,7 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
         mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), mGLFont,
                                                                  &LLComboBox::onItemSelected, this, FALSE);
         mList->setVisible(FALSE);
-        mList->setBgWriteableColor( LLColor4(1,1,1,1) );
+        mList->setBgWriteableColor(mListColor);
         mList->setCommitOnKeyboardMovement(FALSE);
         addChild(mList);
 
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index f92fe44..12637a0 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -187,12 +187,13 @@ public:
         virtual void    hideList();
 
 protected:
-        LLButton*                       mButton;
+        LLButton*               mButton;
         LLScrollListCtrl*       mList;
         EPreferredPosition      mListPosition;
         LLPointer<LLUIImage>    mArrowImage;
-        std::string                     mLabel;
+        std::string             mLabel;
         const LLFontGL*         mGLFont;
+        LLColor4                mListColor;
 
 private:
         S32                                     mButtonPadding;
diff --git a/linden/indra/newview/skins/gemini/colors_base.xml b/linden/indra/newview/skins/gemini/colors_base.xml
index 935c6d3..b4b9269 100644
--- a/linden/indra/newview/skins/gemini/colors_base.xml
+++ b/linden/indra/newview/skins/gemini/colors_base.xml
@@ -66,7 +66,7 @@
 <ScrollBgWriteableColor value="33, 33, 33, 80" />

 <ScrollBGStripeColor value="100, 100, 100, 25" />

 <ScrollDisabledColor value="33, 33, 33, 204" />

-<ScrollSelectedBGColor value="222, 222, 222, 150" />

+<ScrollSelectedBGColor value="33, 33, 33, 204" />

 <ScrollSelectedFGColor value="255, 255, 255, 255" />                <!-- Text color -->

 <ScrollUnselectedColor value="222, 222, 222, 150" />                <!-- Text color -->

 <ScrollHighlightedColor value="222, 222, 222, 80" />        <!-- Hover color -->