From 798d367d54a6c6379ad355bd8345fa40e31e7fe9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Sep 2008 18:24:57 -0500
Subject: Second Life viewer sources 1.21.0-RC

---
 linden/indra/newview/llfloaternewim.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'linden/indra/newview/llfloaternewim.cpp')

diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index dc9fabf..eda9660 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -39,8 +39,8 @@
 
 S32 COL_1_WIDTH = 200;
 
-static LLString sOnlineDescriptor = "*";
-static LLString sNameFormat = "[FIRST] [LAST]";
+static std::string sOnlineDescriptor = "*";
+static std::string sNameFormat = "[FIRST] [LAST]";
 
 LLFloaterNewIM::LLFloaterNewIM()
 {
@@ -181,7 +181,7 @@ void LLFloaterNewIM::onStart(void* userdata)
 	if(item)
 	{
 		const LLScrollListCell* cell = item->getColumn(0);
-		LLString name(cell->getValue());
+		std::string name(cell->getValue());
 
 		// *NOTE: Do a live detrmination of what type of session it
 		// should be. If we restrict the new im panel to online users,
-- 
cgit v1.1