diff options
| author | AndreyL ProductEngine <none@none> | 2018-02-12 21:09:20 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <none@none> | 2018-02-12 21:09:20 +0200 |
| commit | 02342cb9ae3140cb49ec2818fee5692b3796bf8a (patch) | |
| tree | 7f17de74f139981c9493f711f4bfdd6906cd533f /indra/newview/llappviewer.cpp | |
| parent | 4d7a59c232aa5844a936e9883cb2bee4c01aaaba (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); |