diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
| commit | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (patch) | |
| tree | 7a0787f0cb5a70890b878e999521ff4522fd75b4 /indra/newview/llexpandabletextbox.cpp | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
| parent | 9838884d908ad0c910251c64c7cb3c761ac11f70 (diff) | |
merged from "viewer-hotfix"
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 92fda31cc2..149ba2478d 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -140,13 +140,7 @@ void LLExpandableTextBox::LLTextBoxEx::setText(const LLStringExplicit& text,cons // LLTextBox::setText will obliterate the expander segment, so make sure // we generate it again by clearing mExpanderVisible mExpanderVisible = false; - - // Workaround for EXT-8259: trim text before rendering it. - { - std::string trimmed_text(text); - LLStringUtil::trim(trimmed_text); - LLTextEditor::setText(trimmed_text, input_params); - } + LLTextEditor::setText(text, input_params); // text contents have changed, segments are cleared out // so hide the expander and determine if we need it |