diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
| commit | d603085c0332f5d615cc6583e13ed0aa5ab21908 (patch) | |
| tree | bac8d5e6b99643448579060d38a2e69fab65caf7 /indra/newview/llexpandabletextbox.cpp | |
| parent | 474457ea7ea1bd178682788426a4cf40c3fffdcd (diff) | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 149ba2478d..92fda31cc2 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -140,7 +140,13 @@ 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; - LLTextEditor::setText(text, input_params); + + // Workaround for EXT-8259: trim text before rendering it. + { + std::string trimmed_text(text); + LLStringUtil::trim(trimmed_text); + LLTextEditor::setText(trimmed_text, input_params); + } // text contents have changed, segments are cleared out // so hide the expander and determine if we need it |