diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/llui/lltexteditor.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index cede015016..12ad339886 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -520,7 +520,7 @@ void LLTextEditor::truncate() } } -void LLTextEditor::setText(const LLString &utf8str) +void LLTextEditor::setText(const LLStringExplicit &utf8str) { // LLString::removeCRLF(utf8str); mUTF8Text = utf8str_removeCRLF(utf8str); @@ -3068,7 +3068,7 @@ void LLTextEditor::onTabInto() void LLTextEditor::clear() { - setText(""); + setText(LLString::null); } // Start or stop the editor from accepting text-editing keystrokes @@ -3949,7 +3949,7 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer ) if( success ) { // Actually set the text - setText( text ); + setText( LLStringExplicit(text) ); } delete[] text; |