diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llfloaternewim.cpp | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-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.cpp | 6 |
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 | ||
40 | S32 COL_1_WIDTH = 200; | 40 | S32 COL_1_WIDTH = 200; |
41 | 41 | ||
42 | static LLString sOnlineDescriptor = "*"; | 42 | static std::string sOnlineDescriptor = "*"; |
43 | static LLString sNameFormat = "[FIRST] [LAST]"; | 43 | static std::string sNameFormat = "[FIRST] [LAST]"; |
44 | 44 | ||
45 | LLFloaterNewIM::LLFloaterNewIM() | 45 | LLFloaterNewIM::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, |