diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 21:36:34 +0800 |
| commit | ff09b049a7916a73301bd02f9810994025d88e06 (patch) | |
| tree | 2f2fe764116db1401fae342c1930be5e9a70a3e3 /indra/llui/lltexteditor.cpp | |
| parent | 6524295bf06f58fad84dc7251f6ba3fd81ce94f2 (diff) | |
| parent | 11fc2da6fa5fba0bb659dd97f8533e4529aece06 (diff) | |
merge
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(); } |