diff options
| author | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <none@none> | 2018-02-12 21:15:00 +0200 |
| commit | e6765df1baa40a46b77e5362c8855a336125e5f7 (patch) | |
| tree | ffb3564aaa95b23f0d7ab6f6eeea8d08f3e9b317 /indra/newview/llappviewer.cpp | |
| parent | b0950991988ddd56bec9074316d883a00b0cae4c (diff) | |
| parent | 02342cb9ae3140cb49ec2818fee5692b3796bf8a (diff) | |
Merged in lindenlab/viewer-bear
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 c357244c46..d9273dfcb5 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2172,8 +2172,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); |