summaryrefslogtreecommitdiff
path: root/indra/newview/llexpandabletextbox.cpp
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-07-15 12:31:08 -0700
committerDessie Linden <dessie@lindenlab.com>2010-07-15 12:31:08 -0700
commit5d85dad85f07ea23b3a2892276d8ac591a966864 (patch)
tree97aa94cc757e24239f8b13c0cedb3e4a543fff06 /indra/newview/llexpandabletextbox.cpp
parent4339600d43601f07d01c676cce5da17c2758c4cb (diff)
Reverted changeset 2bb10eae42bf
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
-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 92fda31cc2..149ba2478d 100644
--- a/indra/newview/llexpandabletextbox.cpp
+++ b/indra/newview/llexpandabletextbox.cpp
@@ -140,13 +140,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