diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:17:31 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:17:31 +0800 |
| commit | b1a81afef6395e136f26e296311ec9b57eef260e (patch) | |
| tree | a20f0d5f917fe6003d84d3ddb2db17e63b9677c7 /indra/llui/lltextbox.cpp | |
| parent | d1f8328b1e3bc17b920dfc3f8bc1865dff19d039 (diff) | |
add optional style params in setText function
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 */ ) |