1 files changed, 11 insertions, 9 deletions

diff --git a/linden/indra/newview/llfloaternewim.cpp b/linden/indra/newview/llfloaternewim.cpp
index 48920c1..272cb53 100644
--- a/linden/indra/newview/llfloaternewim.cpp
+++ b/linden/indra/newview/llfloaternewim.cpp
@@ -38,10 +38,9 @@
 #include "lltabcontainer.h"
 #include "llimview.h"
 
-S32 COL_1_WIDTH = 200;
+S32 COL_1_WIDTH = 400;
 
 static std::string sOnlineDescriptor = "*";
-static std::string sNameFormat = "[FIRST] [LAST]";
 
 LLFloaterNewIM::LLFloaterNewIM()
 {
@@ -69,7 +68,6 @@ BOOL LLFloaterNewIM::postBuild()
                         llwarns << "LLUICtrlFactory::getNameListByName() returned NULL for 'user_list'" << llendl;
                 }
                 sOnlineDescriptor = getString("online_descriptor");
-                sNameFormat = getString("name_format");
                 setDefaultBtn("start_btn");
                 return TRUE;
         }       
@@ -135,11 +133,8 @@ void LLFloaterNewIM::addGroup(const LLUUID& uuid, void* data, BOOL bold, BOOL on
 
 void LLFloaterNewIM::addAgent(const LLUUID& uuid, void* data, BOOL online)
 {
-        std::string first, last;
-        gCacheName->getName(uuid, first, last);
-        LLUIString fullname = sNameFormat;
-        fullname.setArg("[FIRST]", first);
-        fullname.setArg("[LAST]", last);
+        std::string fullname;
+        gCacheName->getFullName(uuid, fullname);
 
         LLSD row;
         row["id"] = uuid;
@@ -184,13 +179,20 @@ void LLFloaterNewIM::onStart(void* userdata)
                 const LLScrollListCell* cell = item->getColumn(0);
                 std::string name(cell->getValue());
 
-                // *NOTE: Do a live detrmination of what type of session it
+                // *NOTE: Do a live determination of what type of session it
                 // should be. If we restrict the new im panel to online users,
                 // then we can remove some of this code.
                 EInstantMessage type;
                 EInstantMessage* t = (EInstantMessage*)item->getUserdata();
                 if(t) type = (*t);
                 else type = LLIMMgr::defaultIMTypeForAgent(item->getUUID());
+                if (type != IM_SESSION_GROUP_START)
+                {
+                        // Needed to avoid catching a display name, which would
+                        // make us use a wrong IM log file...
+                        gCacheName->getFullName(item->getUUID(), name);
+                }
+
                 gIMMgr->addSession(name, type, item->getUUID());
 
                 make_ui_sound("UISndStartIM");