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/newview/llexpandabletextbox.cpp | |
parent | d1f8328b1e3bc17b920dfc3f8bc1865dff19d039 (diff) |
add optional style params in setText function
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 424d635321..6d7da107ac 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -129,12 +129,12 @@ void LLExpandableTextBox::LLTextBoxEx::reshape(S32 width, S32 height, BOOL calle } } -void LLExpandableTextBox::LLTextBoxEx::setText(const LLStringExplicit& text) +void LLExpandableTextBox::LLTextBoxEx::setText(const LLStringExplicit& text,const LLStyle::Params& input_params) { // LLTextBox::setText will obliterate the expander segment, so make sure // we generate it again by clearing mExpanderVisible mExpanderVisible = false; - LLTextBox::setText(text); + LLTextBox::setText(text, input_params); // text contents have changed, segments are cleared out // so hide the expander and determine if we need it |