summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorcallum_linden <none@none>2018-04-12 15:22:25 -0700
committercallum_linden <none@none>2018-04-12 15:22:25 -0700
commit6c953d0bde107059db75d01cd30326a31cd0de54 (patch)
treec41563bccdcccc3bb263cca68c12f90ce0dbde88 /indra/llcrashlogger
parentbdd7bdf390775860fb26a6c7d0923f45bb20256c (diff)
parent41f4e854732a7c75a813b2e99285cc41bde13e5e (diff)
Automated merge with tip of viewer-release after Viewer Media Update release
Diffstat (limited to 'indra/llcrashlogger')
-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";