diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:35:08 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:35:08 +0300 |
| commit | fb170ffe2102f7245037a8b1eeb39db7ec8d5820 (patch) | |
| tree | 0687368ffd56c450f490b317f21ef9a4a0197a67 /indra/newview/llappviewer.cpp | |
| parent | 1e7fd6302aa39f1a011e2e4d711bca7a88a62076 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge branch 'master' into DRTVWR-545-maint-mix
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 ecd62cadf8..3ec6d3f90e 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -737,7 +737,7 @@ LLAppViewer::LLAppViewer() std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, ""); # endif // ! LL_BUGSPLAT mDumpPath = logdir; - setMiniDumpDir(logdir); + setDebugFileNames(logdir); } @@ -2020,7 +2020,9 @@ bool LLAppViewer::cleanup() if (LLConversationLog::instanceExists()) { LLConversationLog::instance().cache(); - } + } + + clearSecHandler(); if (mPurgeCacheOnExit) { |