diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-11-16 16:28:04 +0200 |
| commit | eef22e0baf9e62f8c38058ad22e6e6bd5e5aca26 (patch) | |
| tree | 2a498eb73a80802c7811193ce63253c9be905295 /indra/llui/lltexteditor.cpp | |
| parent | 59d575fe615bf14a10056c9b9fe0c109ec2c103e (diff) | |
| parent | bd42c1ae2cd6bb6e005478cc121c2b5d7a844eb4 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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(); } |