From 5ec8bbbe2244ea70d8aa74b5c572351632699425 Mon Sep 17 00:00:00 2001
From: Christian Goetze <cg@lindenlab.com>
Date: Wed, 10 Oct 2007 00:01:43 +0000
Subject: svn merge -r71238:71367
 svn+ssh://svn/svn/linden/branches/maint-ui-qa3

---
 indra/llui/lltexteditor.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/llui/lltexteditor.cpp')

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;
-- 
cgit v1.2.3