diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-13 19:44:01 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2009-11-13 19:44:01 +0000 |
| commit | 224cfffa1c46e144f290402f33b96d23cb27d98c (patch) | |
| tree | 052fd0e5c761542d89d3b2553a02acaf68d4d408 /indra/llui/lltextbox.cpp | |
| parent | 7722105e4ea4b5268f2eb1862eae2d55b3bfc933 (diff) | |
| parent | 7e2d2406584ffe3a0c2f87734ada194a92b82df6 (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 */ ) |