diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
| commit | ff09b049a7916a73301bd02f9810994025d88e06 (patch) | |
| tree | 2f2fe764116db1401fae342c1930be5e9a70a3e3 /indra/llui/lltextbox.cpp | |
| parent | 6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff) | |
| parent | 11fc2da6fa5fba0bb659dd97f8533e4529aece06 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltextbox.cpp')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 00f1d833a3..4c4123cf45 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -112,12 +112,12 @@ BOOL LLTextBox::handleHover(S32 x, S32 y, MASK mask) return handled; } -void LLTextBox::setText(const LLStringExplicit& text) +void LLTextBox::setText(const LLStringExplicit& text , const LLStyle::Params& input_params ) { // does string argument insertion mText.assign(text); - LLTextBase::setText(mText.getString()); + LLTextBase::setText(mText.getString(), input_params ); } void LLTextBox::setClickedCallback( boost::function<void (void*)> cb, void* userdata /*= NULL */ ) |