diff options
| author | Richard Linden <none@none> | 2010-07-27 14:34:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-07-27 14:34:17 -0700 |
| commit | 6cd862063d8e9ce68efd0e15aeb3da76160fcd81 (patch) | |
| tree | 3f98c889d39e5fcf303bf08615a51d400ec64cde /indra/newview/llexpandabletextbox.cpp | |
| parent | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (diff) | |
| parent | 15247f086989a43881d79c1ee5416bb00721eb68 (diff) | |
merge
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 |