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/newview/llexpandabletextbox.cpp | |
| parent | 7722105e4ea4b5268f2eb1862eae2d55b3bfc933 (diff) | |
| parent | 7e2d2406584ffe3a0c2f87734ada194a92b82df6 (diff) | |
merge.
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 |