diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-02-15 20:03:59 +0200 |
| commit | d0811218381cfa9d201d7b72532e19d98bda250a (patch) | |
| tree | 65d3c325feeac71171813d3302bd1c4517b22cb2 /indra/newview/llappviewer.cpp | |
| parent | cc30a9e2f5b9410dcdf323d3ecdd3f6f1e2985db (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Merged in lindenlab/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 b33b3a6410..464e216cf0 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2183,8 +2183,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); |