diff options
| author | Oz Linden <oz@lindenlab.com> | 2017-02-27 09:52:50 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2017-02-27 09:52:50 -0500 |
| commit | 0a7fd3686a09a53ebe86e1e37b156e2f04f6cb2f (patch) | |
| tree | 179e938b5a0825bb97af2e9480c7356c23ed7528 /indra/newview | |
| parent | 12e23a3cb8aadfc74f2ba469c671df51552c557b (diff) | |
Look for logcontrol-dev.xml in the user settings directory
Diffstat (limited to 'indra/newview')
| -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 d0c7d0b72e..86bf44567d 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2206,8 +2206,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); |