diff options
| author | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-02-14 10:56:31 -0800 |
| commit | 08cb3fbe32b62ed3f53f68633ada9eab44dccb0b (patch) | |
| tree | caa4327b04a438978fd9bae207ea86269f1525b6 /indra/newview/llappviewer.cpp | |
| parent | b2eb85df79f317d2b587c969178cea9b96c81213 (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index d22d0dcf59..eed052b82a 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2181,8 +2181,9 @@ void LLAppViewer::initLoggingAndGetLastDuration() // // Set up logging defaults for the viewer // - LLError::initForApplication( - gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "")); + LLError::initForApplication( gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "") + ,gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "") + ); LLError::setFatalFunction(errorCallback); //LLError::setTimeFunction(getRuntime); |