svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3

EXT-172 - adding non-unicode support for group name line_editor
EXT-310 text was squished, moved things around so there was was more space between text blocks.
EXT-313 "me" panel
EXT-314 changed out arrow character for arrow art, added arrow art to textures.xml
EXT-315 replaced word "mute" with "block"
EXT-322 moved Use Chat Bubbles text box from _chat.xml to _advanced.xml
EXT-323 killed some two items
EXT-324 and EXT-322 removed small avatar names checkbox and added show chat bubbled checkbox
EXT-330 Sidetray filter - text overlaps search icon inside textbox
EXT-261  I18N: Labels in /character/avatar_lad.xml are not localizable
EXT-392 Rearranged floater_inventory_items_properties.xml to match spec
DEV-35897  Filters in sidebar remain active even after user has changed/closed tab
DEV-36886 I18N: hardcoded currency format in panel_status_bar.xml/status/buycurrency
DEV-36987 - Pressed states needed for widgets
DEV-36795 Remove slurl tooltip from navigation bar location box
DEV-37184 Move "Block List" out of topmenu and make a button in Prefs > Privacy

1 files changed, 1 insertions, 20 deletions

diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index f8c6204afb..93d2b83c9f 100644
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -182,12 +182,6 @@ LLComboBox::~LLComboBox()
 }
 
 
-void LLComboBox::setEnabled(BOOL enabled)
-{
-	LLView::setEnabled(enabled);
-	mButton->setEnabled(enabled);
-}
-
 void LLComboBox::clear()
 { 
 	if (mTextEntry)
@@ -196,8 +190,6 @@ void LLComboBox::clear()
 	}
 	mButton->setLabelSelected(LLStringUtil::null);
 	mButton->setLabelUnselected(LLStringUtil::null);
-	mButton->setDisabledLabel(LLStringUtil::null);
-	mButton->setDisabledSelectedLabel(LLStringUtil::null);
 	mList->deselectAllItems();
 }
 
@@ -376,10 +368,7 @@ void LLComboBox::setLabel(const LLStringExplicit& name)
 	
 	if (!mAllowTextEntry)
 	{
-		mButton->setLabelUnselected(name);
-		mButton->setLabelSelected(name);
-		mButton->setDisabledLabel(name);
-		mButton->setDisabledSelectedLabel(name);
+		mButton->setLabel(name);
 	}
 }
 
@@ -441,14 +430,6 @@ void LLComboBox::setButtonVisible(BOOL visible)
 	}
 }
 
-void LLComboBox::draw()
-{
-	mButton->setEnabled(getEnabled() /*&& !mList->isEmpty()*/);
-
-	// Draw children normally
-	LLUICtrl::draw();
-}
-
 BOOL LLComboBox::setCurrentByIndex( S32 index )
 {
 	BOOL found = mList->selectNthItem( index );