diff options
author | andreykproductengine <akleshchev@productengine.com> | 2016-07-05 17:52:01 +0300 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2016-07-05 17:52:01 +0300 |
commit | 4b29e9869c52fcba33d40c530eb2fa92648c330e (patch) | |
tree | fa22bca1cd8d712be4f8f083b3674a803d9893b2 /indra/newview/llconversationlog.cpp | |
parent | 9b7f38f6fb1a4b19c5cc7cab2f673e2bc9f5ae93 (diff) |
MAINT-5388 File "conversation.log" created in users' root directory on Windows
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
-rw-r--r-- | indra/newview/llconversationlog.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 05c7e6caa5..4e69896b69 100644 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -448,7 +448,12 @@ bool LLConversationLog::moveLog(const std::string &originDirectory, const std::s std::string LLConversationLog::getFileName() { std::string filename = "conversation"; - return gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS, filename) + ".log"; + std::string log_address = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS, filename); + if (!log_address.empty()) + { + log_address += ".log"; + } + return log_address; } bool LLConversationLog::saveToFile(const std::string& filename) |