diff options
| author | angela <angela@lindenlab.com> | 2009-11-13 15:20:04 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-13 15:20:04 +0800 |
| commit | a7b8b51a5aabfbe58a904896fb1e7a1c812c2bc6 (patch) | |
| tree | f16a6c5c3ffaccab7dedc7c94dcceeed4909a6ee /indra/llui/lltexteditor.cpp | |
| parent | 9054f31f89963f2f24a6b872fbc6816ee01f0d70 (diff) | |
| parent | 01f1eaf7e0faaa3ecde36ac28a346fed53a571fd (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(); } |