summaryrefslogtreecommitdiff
path: root/indra/newview/lllogchat.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-11-16 09:52:59 -0500
committerOz Linden <oz@lindenlab.com>2016-11-16 09:52:59 -0500
commitfd2ccb16068dfd21307b17e78e384d8ae19fef12 (patch)
tree3e40dcddd3117820008047b81ec218e9cc0ffb7c /indra/newview/lllogchat.cpp
parent8baf88a073f30d217e03ee56b4a255121ac98071 (diff)
parentecd93e56781498ef73ea2a3d5be0c449179b6a0a (diff)
merge changes for 4.1.2-release
Diffstat (limited to 'indra/newview/lllogchat.cpp')
-rw-r--r--indra/newview/lllogchat.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index 639641d1c2..485d4677b1 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -244,7 +244,10 @@ std::string LLLogChat::makeLogFileName(std::string filename)
filename = cleanFileName(filename);
filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_ACCOUNT_CHAT_LOGS, filename);
- filename += '.' + LL_TRANSCRIPT_FILE_EXTENSION;
+ if (!filename.empty())
+ {
+ filename += '.' + LL_TRANSCRIPT_FILE_EXTENSION;
+ }
return filename;
}