summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger/llcrashlogger.cpp
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-02-14 10:56:31 -0800
committercallum_linden <none@none>2018-02-14 10:56:31 -0800
commit08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch)
treecaa4327b04a438978fd9bae207ea86269f1525b6 /indra/llcrashlogger/llcrashlogger.cpp
parentb2eb85df79f317d2b587c969178cea9b96c81213 (diff)
parent5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff)
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/llcrashlogger/llcrashlogger.cpp')
-rw-r--r--indra/llcrashlogger/llcrashlogger.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 1d58dba9ab..5e74715500 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -566,7 +566,7 @@ bool LLCrashLogger::init()
// We assume that all the logs we're looking for reside on the current drive
gDirUtilp->initAppDirs("SecondLife");
- LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
+ LLError::initForApplication(gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, ""), gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, ""));
// Default to the product name "Second Life" (this is overridden by the -name argument)
mProductName = "Second Life";