From 759ae31ebe9121dfc35939b2eb2b2c05a5168616 Mon Sep 17 00:00:00 2001
From: PanteraPolnocy <panterapolnocy@gmail.com>
Date: Thu, 25 Jun 2026 00:00:24 +0200
Subject: [PATCH] Restore open IMs from previous session - defer recreating the
 session until the avatar name has resolved Creating new session shortly after
 logging in sometimes make buildHistoryFileName() fall back to the cached
 display name, creating a detached log text file

Signed-off-by: PanteraPolnocy <panterapolnocy@gmail.com>
---
 indra/newview/fsfloaterimcontainer.cpp | 61 +++++++++++++++++---------
 indra/newview/fsfloaterimcontainer.h   |  1 +
 2 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/indra/newview/fsfloaterimcontainer.cpp b/indra/newview/fsfloaterimcontainer.cpp
index 7706466987..7b014d306c 100644
--- a/indra/newview/fsfloaterimcontainer.cpp
+++ b/indra/newview/fsfloaterimcontainer.cpp
@@ -43,6 +43,7 @@
 #include "llvoiceclient.h"
 
 // <FS:PP> Restore open IMs from previous session
+#include "llavatarnamecache.h"
 #include "llconversationlog.h"
 #include "llimview.h"
 // </FS:PP>
@@ -765,28 +766,48 @@ void FSFloaterIMContainer::restoreOpenIMs()
 
     for (LLSD::array_const_iterator it = openIMs.beginArray(); it != openIMs.endArray(); ++it)
     {
-        LLSD session_data = *it;
-        if (session_data.isMap())
+        const LLSD& session_data = *it;
+        if (!session_data.isMap())
         {
-            LLUUID other_participant_id = session_data["other_participant_id"].asUUID();
-            std::string session_name = session_data["session_name"].asString();
-            if (other_participant_id.notNull())
-            {
-                LLUUID new_session_id;
-                new_session_id = LLIMMgr::getInstance()->addSession(session_name, IM_NOTHING_SPECIAL, other_participant_id);
-                if (new_session_id.notNull())
-                {
-                    FSFloaterIM* im_floater = FSFloaterIM::show(new_session_id);
-                    if (im_floater)
-                    {
-                        if (im_floater->getHost() != this)
-                        {
-                            addFloater(im_floater, false, IM_NOTHING_SPECIAL);
-                        }
-                    }
-                }
-            }
+            continue;
         }
+
+        const LLUUID other_participant_id = session_data["other_participant_id"].asUUID();
+        if (other_participant_id.isNull())
+        {
+            continue;
+        }
+
+        LLAvatarNameCache::get(other_participant_id, boost::bind(&FSFloaterIMContainer::restoreOpenIMSession, _1));
+    }
+}
+
+void FSFloaterIMContainer::restoreOpenIMSession(const LLUUID& other_participant_id)
+{
+    if (other_participant_id.isNull())
+    {
+        return;
+    }
+
+    LLAvatarName av_name;
+    LLAvatarNameCache::get(other_participant_id, &av_name);
+
+    const LLUUID new_session_id = LLIMMgr::getInstance()->addSession(av_name.getDisplayName(), IM_NOTHING_SPECIAL, other_participant_id);
+    if (new_session_id.isNull())
+    {
+        return;
+    }
+
+    FSFloaterIM* im_floater = FSFloaterIM::show(new_session_id);
+    if (!im_floater)
+    {
+        return;
+    }
+
+    FSFloaterIMContainer* container = FSFloaterIMContainer::findInstance();
+    if (container && im_floater->getHost() != container)
+    {
+        container->addFloater(im_floater, false, IM_NOTHING_SPECIAL);
     }
 }
 // </FS:PP>
diff --git a/indra/newview/fsfloaterimcontainer.h b/indra/newview/fsfloaterimcontainer.h
index 71cdf59e59..0739ab250a 100644
--- a/indra/newview/fsfloaterimcontainer.h
+++ b/indra/newview/fsfloaterimcontainer.h
@@ -91,6 +91,7 @@ public:
     // <FS:PP> Restore open IMs from previous session
     void saveOpenIMs();
     void restoreOpenIMs();
+    static void restoreOpenIMSession(const LLUUID& other_participant_id);
     // </FS:PP>
 
 private: