diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-04-29 12:28:26 -0600 |
commit | 59ab227c4020565f85e6fc2edf3e3fcc16abb574 (patch) | |
tree | 94265895fdc0df4d3c38f74288cbd87bc2e01c20 /indra/newview/llimview.cpp | |
parent | 029f179719907d674f89e39577c37e82e654b59d (diff) | |
parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) |
DRTVWR-528 merge up to 6.4.19
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r-- | indra/newview/llimview.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 9afb6ca58b..1059324a16 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -969,6 +969,9 @@ void LLIMModel::LLIMSession::buildHistoryFileName() // Incoming P2P sessions include a name that we can use to build a history file name mHistoryFileName = LLCacheName::buildUsername(mName); } + + // user's account name can change, but filenames and session names are account name based + LLConversationLog::getInstance()->verifyFilename(mSessionID, mHistoryFileName, av_name.getCompleteName()); } else if (isGroupChat()) { |