diff options
| author | Dessie Linden <dessie@lindenlab.com> | 2010-07-12 11:14:26 -0700 |
|---|---|---|
| committer | Dessie Linden <dessie@lindenlab.com> | 2010-07-12 11:14:26 -0700 |
| commit | b45271834161018be8c825e96c64d9ef7b67401c (patch) | |
| tree | bfa36a69e2ee97a32a5cf2dd06d610cb5c1656bb /indra/newview/llexpandabletextbox.cpp | |
| parent | 809a7a3b78f5f14ef22d3a8725e958b1705bd102 (diff) | |
| parent | d3f114d6901877bb79ae9719f59d681fa6a9d494 (diff) | |
Merged from 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 |