aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaternewim.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-09-06 18:24:57 -0500
committerJacek Antonelli2008-09-06 18:25:07 -0500
commit798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch)
tree1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaternewim.cpp
parentSecond Life viewer sources 1.20.15 (diff)
downloadmeta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2
meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz
Second Life viewer sources 1.21.0-RC
Diffstat (limited to 'linden/indra/newview/llfloaternewim.cpp')
-rw-r--r--linden/indra/newview/llfloaternewim.cpp6
1 files changed, 3 insertions, 3 deletions
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 @@
39 39
40S32 COL_1_WIDTH = 200; 40S32 COL_1_WIDTH = 200;
41 41
42static LLString sOnlineDescriptor = "*"; 42static std::string sOnlineDescriptor = "*";
43static LLString sNameFormat = "[FIRST] [LAST]"; 43static std::string sNameFormat = "[FIRST] [LAST]";
44 44
45LLFloaterNewIM::LLFloaterNewIM() 45LLFloaterNewIM::LLFloaterNewIM()
46{ 46{
@@ -181,7 +181,7 @@ void LLFloaterNewIM::onStart(void* userdata)
181 if(item) 181 if(item)
182 { 182 {
183 const LLScrollListCell* cell = item->getColumn(0); 183 const LLScrollListCell* cell = item->getColumn(0);
184 LLString name(cell->getValue()); 184 std::string name(cell->getValue());
185 185
186 // *NOTE: Do a live detrmination of what type of session it 186 // *NOTE: Do a live detrmination of what type of session it
187 // should be. If we restrict the new im panel to online users, 187 // should be. If we restrict the new im panel to online users,