diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-10 13:52:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-10 13:52:05 +0100 |
| commit | 5190e7c1bb75e6c8f8396eef5a74b03cb2237b86 (patch) | |
| tree | 80323b5d1c4d0fc90f796b3af3dac834af8c8b3e /indra/newview/llexpandabletextbox.cpp | |
| parent | ee50934d886b07c85e3be0515ff3e53625052faa (diff) | |
| parent | 331ccee1f5cea9fab944c934b3beeb70fc7f6504 (diff) | |
merge from PE's 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 |