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/newview/llexpandabletextbox.cpp | |
| parent | fd9257a5f2649d7afbf65067c0fa4653fc81272c (diff) | |
| parent | b4a3b65a602ad56baf761a8426093eda585bc572 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
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 |