diff options
| author | angela <angela@lindenlab.com> | 2009-11-13 08:43:56 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-13 08:43:56 +0800 |
| commit | 0d4ccb9d1c0761864c8b0c19f0bdd1700b425837 (patch) | |
| tree | 717db44548966f400b3d2cfb84817b01761f70b7 /indra/llui/lltextbox.cpp | |
| parent | fd9257a5f2649d7afbf65067c0fa4653fc81272c (diff) | |
| parent | b4a3b65a602ad56baf761a8426093eda585bc572 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
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 */ ) |