diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-02-26 09:29:38 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-02-26 09:29:38 -0800 |
| commit | e2e63598d40109d01e0311ce1444d3feedffcf66 (patch) | |
| tree | 167a7d41785623cea7d7b466b4b0554e80639a55 /indra/newview/llappviewer.cpp | |
| parent | b766466b3013e39831bcfcaef5d1089c07202afb (diff) | |
| parent | 5510b589b136d354ce2975c45f41ccc7e66e9d21 (diff) | |
Merge
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 95e5cbe09e..32aad191d3 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); |