diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-16 11:05:33 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-16 11:05:33 -0500 |
| commit | 95cbf689f343ba4c0c352993273b5bb20812e36c (patch) | |
| tree | dabc2ffc10bc027da8c60168e0190a0da98b5722 /indra/newview/llexpandabletextbox.cpp | |
| parent | 59eb2815bfea9b0a826e006090d0fef80ae1f6b8 (diff) | |
| parent | 6f52f1e502cf030ceb4e14963fdda1021ea33023 (diff) | |
merge
--HG--
branch : avatar-pipeline
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 |