diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-11 17:35:31 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-11 17:35:31 +0300 |
| commit | 03f43664223e7bf57aba04f81bc3737c6ab63285 (patch) | |
| tree | 2c3d21f7a8884f6be2fd847c6b18d8efbf5d1b2d /indra/llui | |
| parent | 5ec3357a6ccf6b6f05d99105db8f510fd395f043 (diff) | |
EXT-7792 FIXED Made Wear button disabled if there are no selected outfit (or list is empty).
Also fixed some issues in accordion caused by removing My Outfits content via Inventory:
- updated accordion's help text to not shown nothing if there are no any tabs and filter substring is empty.
- added check of necessity to show help text when accordion "arrange"
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/568/
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llaccordionctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp index cd23d5cd33..fc93793ed8 100644 --- a/indra/llui/llaccordionctrl.cpp +++ b/indra/llui/llaccordionctrl.cpp @@ -523,6 +523,8 @@ void LLAccordionCtrl::arrangeMultiple() void LLAccordionCtrl::arrange() { + updateNoTabsHelpTextVisibility(); + if( mAccordionTabs.size() == 0) { //We do not arrange if we do not have what should be arranged @@ -818,7 +820,7 @@ void LLAccordionCtrl::setFilterSubString(const std::string& filter_string) { LLStringUtil::format_map_t args; args["[SEARCH_TERM]"] = LLURI::escape(filter_string); - std::string text = mNoVisibleTabsOrigString; + std::string text = filter_string.empty() ? LLStringUtil::null : mNoVisibleTabsOrigString; LLStringUtil::format(text, args); mNoVisibleTabsHelpText->setValue(text); |