diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-22 15:27:15 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-22 15:27:15 +0300 |
| commit | 07aa342bc4060ff4b4b38cfa60550835dd744f1f (patch) | |
| tree | d0dbdc534d4144ed805ee62cc90a43115ec8929e /indra/newview/llappviewer.cpp | |
| parent | b078daf4d24d290abdc222e9cd3ef272c93ba5fa (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge branch 'master' into DRTVWR-530-maint
# Conflicts:
# autobuild.xml
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index e51cefed63..f89fdaa221 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -739,7 +739,7 @@ LLAppViewer::LLAppViewer() std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, ""); # endif // ! LL_BUGSPLAT mDumpPath = logdir; - setMiniDumpDir(logdir); + setDebugFileNames(logdir); } @@ -2008,7 +2008,9 @@ bool LLAppViewer::cleanup() if (LLConversationLog::instanceExists()) { LLConversationLog::instance().cache(); - } + } + + clearSecHandler(); if (mPurgeCacheOnExit) { |