diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:49 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:49 +0800 |
| commit | f9646bd759f87012fcf59c9ca5822490ec196666 (patch) | |
| tree | 228572fc26e369f6208f8a00f7f08a63829f3520 /indra/llui/lltexteditor.cpp | |
| parent | 95adfa4cacb68e21b7251882feffbc7cb50b4438 (diff) | |
| parent | ff09b049a7916a73301bd02f9810994025d88e06 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index d136c6b49d..224f066968 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -311,12 +311,12 @@ LLTextEditor::~LLTextEditor() // LLTextEditor // Public methods -void LLTextEditor::setText(const LLStringExplicit &utf8str) +void LLTextEditor::setText(const LLStringExplicit &utf8str, const LLStyle::Params& input_params) { blockUndo(); deselect(); - LLTextBase::setText(utf8str); + LLTextBase::setText(utf8str, input_params); resetDirty(); } |