diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-14 10:55:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-14 10:55:25 -0700 |
| commit | baf9b3cb078c04b019fccc4ae8a54db05b14bdef (patch) | |
| tree | aa422043ec900036716d35e73240efc9df152d32 /indra/llui | |
| parent | 76cf9e29a77566c10da6184833fad6b0912e9688 (diff) | |
| parent | fbc95fe7e77ed093f8f7938a4755ce6b175dcaff (diff) | |
Merge
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llaccordionctrl.cpp | 4 | ||||
| -rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
2 files changed, 4 insertions, 2 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); diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 72f3a14822..1a4b804ce4 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -2791,7 +2791,7 @@ bool LLImageTextSegment::getDimensions(S32 first_char, S32 num_chars, S32& width height = llceil(mStyle->getFont()->getLineHeight());; LLUIImagePtr image = mStyle->getImage(); - if( image.notNull()) + if( num_chars>0 && image.notNull()) { width += image->getWidth() + IMAGE_HPAD; height = llmax(height, image->getHeight() + IMAGE_HPAD ); |