diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-07-09 10:19:15 -0400 |
commit | d8f795aa9ceaae73ad8890a1110fa6b4045843c7 (patch) | |
tree | 96bd0bbc9d7bbe2a6a8d9a543fc581d82fdc1965 /indra/llui/llaccordionctrl.cpp | |
parent | 9ae6672a15ae64dba1d2af774dcde26700fb6126 (diff) | |
parent | 467a8b0441e139773775ecf306f430f44814bff5 (diff) |
automated merge
Diffstat (limited to 'indra/llui/llaccordionctrl.cpp')
-rw-r--r-- | indra/llui/llaccordionctrl.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llui/llaccordionctrl.cpp b/indra/llui/llaccordionctrl.cpp index 673631f99a..28125ccaaf 100644 --- a/indra/llui/llaccordionctrl.cpp +++ b/indra/llui/llaccordionctrl.cpp @@ -40,6 +40,8 @@ #include "llfocusmgr.h" #include "lllocalcliprect.h" +#include "lltrans.h" + #include "boost/bind.hpp" static const S32 DRAGGER_BAR_MARGIN = 4; @@ -72,6 +74,7 @@ LLAccordionCtrl::LLAccordionCtrl(const Params& params):LLPanel(params) { initNoTabsWidget(params.no_matched_tabs_text); + mNoVisibleTabsOrigString = LLTrans::getString(params.no_visible_tabs_text.initial_value().asString()); mSingleExpansion = params.single_expansion; if(mFitParent && !mSingleExpansion) { @@ -386,7 +389,7 @@ void LLAccordionCtrl::initNoTabsWidget(const LLTextBox::Params& tb_params) { LLTextBox::Params tp = tb_params; tp.rect(getLocalRect()); - mNoMatchedTabsOrigString = tp.initial_value().asString(); + mNoMatchedTabsOrigString = LLTrans::getString(tp.initial_value().asString()); mNoVisibleTabsHelpText = LLUICtrlFactory::create<LLTextBox>(tp, this); } |