diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-28 22:24:12 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-09-28 22:24:12 +0300 |
commit | 32cb17e3bb86e1d3e7b945f49aa39df7868059ce (patch) | |
tree | 04c2823be5069e50ccb3363a28c4df2e48ec8cea /indra/newview/lllogchat.cpp | |
parent | 7f2388194136fc45d204f09fe63a6bd32d7e99ff (diff) | |
parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) |
Merge branch 'master' into DRTVWR-513-maint
# Conflicts:
# indra/newview/llgroupmgr.cpp
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r-- | indra/newview/lllogchat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |