From cc25193af9a64f36a75f401160f5757498f3e5fc Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Sat, 1 Aug 2020 01:19:10 +0300
Subject: SL-12795 Fix existance of multiple chatlog files after name change

---
 indra/newview/llimview.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/llimview.cpp')

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index d5142a4496..72162a1242 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -601,6 +601,10 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string&
 	}
 
 	buildHistoryFileName();
+    if (isP2P()) // user's account name can change, but filenames are account name based
+    {
+        LLConversationLog::getInstance()->verifyFilename(mSessionID, mHistoryFileName);
+    }
 	loadHistory();
 
 	// Localizing name of ad-hoc session. STORM-153
-- 
cgit v1.2.3