diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2020-03-06 16:49:23 +0200 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2020-03-06 16:49:23 +0200 |
| commit | 57b32eb01cd35bbac440569df885036eb24f2369 (patch) | |
| tree | 75eb30a8e9716d14642674f0c30993455f753d6d | |
| parent | 4e98602746d513ec82a9264a814a05a23ea22d5b (diff) | |
SL-12805 FIXED The Group Chat history can't be opened from the conversations floater
| -rw-r--r-- | indra/newview/llfloaterconversationpreview.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/lllogchat.cpp | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llfloaterconversationpreview.cpp b/indra/newview/llfloaterconversationpreview.cpp index 44725cab70..dd2baacb7e 100644 --- a/indra/newview/llfloaterconversationpreview.cpp +++ b/indra/newview/llfloaterconversationpreview.cpp @@ -84,10 +84,7 @@ BOOL LLFloaterConversationPreview::postBuild() file = "chat"; } mChatHistoryFileName = file; - if (mIsGroup) - { - mChatHistoryFileName += GROUP_CHAT_SUFFIX; - } + LLStringUtil::format_map_t args; args["[NAME]"] = name; std::string title = getString("Title", args); diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp index 0c64531783..354f5a453b 100644 --- a/indra/newview/lllogchat.cpp +++ b/indra/newview/lllogchat.cpp @@ -761,8 +761,8 @@ bool LLLogChat::isTranscriptExist(const LLUUID& avatar_id, bool is_group) { std::string file_name; gCacheName->getGroupName(avatar_id, file_name); - file_name = makeLogFileName(file_name); - return isTranscriptFileFound(makeLogFileName(file_name)); + file_name = makeLogFileName(file_name + GROUP_CHAT_SUFFIX); + return isTranscriptFileFound(file_name); } return false; } |