aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llui/llcombobox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/llui/llcombobox.cpp')
-rw-r--r--linden/indra/llui/llcombobox.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index 2546c4e..e79f7b2 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::
75 mListPosition(BELOW), 75 mListPosition(BELOW),
76 mPrearrangeCallback( NULL ), 76 mPrearrangeCallback( NULL ),
77 mTextEntryCallback( NULL ), 77 mTextEntryCallback( NULL ),
78 mLabel(label) 78 mLabel(label),
79 mListColor(LLUI::sColorsGroup->getColor("ComboBoxBg"))
79{ 80{
80 if (font) 81 if (font)
81 { 82 {
@@ -109,7 +110,7 @@ LLComboBox::LLComboBox( const std::string& name, const LLRect &rect, const std::
109 mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), mGLFont, 110 mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), mGLFont,
110 &LLComboBox::onItemSelected, this, FALSE); 111 &LLComboBox::onItemSelected, this, FALSE);
111 mList->setVisible(FALSE); 112 mList->setVisible(FALSE);
112 mList->setBgWriteableColor( LLColor4(1,1,1,1) ); 113 mList->setBgWriteableColor(mListColor);
113 mList->setCommitOnKeyboardMovement(FALSE); 114 mList->setCommitOnKeyboardMovement(FALSE);
114 addChild(mList); 115 addChild(mList);
115 116