summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-30 10:00:42 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-30 10:00:42 +0100
commit0d910e53eed6f4d5646949aa4412820ba8622782 (patch)
tree39ca49ffb7855d9c9a2dd70582cb2ddd102f581a /indra/newview
parent9df7dd4447a48eecc4077597b7366f4e43f96c18 (diff)
parent2c86deb92a9756e83e0e074dc4de17b2105c9d50 (diff)
merge
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llexpandabletextbox.cpp8
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