diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-30 13:33:19 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-30 13:33:19 +0300 |
| commit | e64b281dd674d3230d83aba0ab622ea48d2ae594 (patch) | |
| tree | c4ad5f8ba3c7ff6456a04fa9e22e3844074dcb54 /indra/newview | |
| parent | 7fcca83169287b5011b5b5a0193456e9a789619c (diff) | |
| parent | 33ebc9674926eb0fd5679ae8e41d05d790b03de1 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -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 8ccc5fb248..8c6265fbc2 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -141,13 +141,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 |