diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-10-22 11:54:18 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-10-22 11:54:18 -0400 |
commit | 14dae8bc8ee55fdd027c7232e3dbcf7b7eedd3cc (patch) | |
tree | 8d84f9c2a7fb2f859f6bb3b1c0dfacc6319cc01e /indra/newview/llappviewer.cpp | |
parent | 11afa09ea3f56c0e20eb195ae1520a88602ceaca (diff) | |
parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) |
SL-16220: Merge branch 'master' into sl-16220
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 7c363eea5e..a016e658ef 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -704,7 +704,7 @@ LLAppViewer::LLAppViewer() std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, ""); # endif // ! LL_BUGSPLAT mDumpPath = logdir; - setMiniDumpDir(logdir); + setDebugFileNames(logdir); } @@ -1977,7 +1977,9 @@ bool LLAppViewer::cleanup() if (LLConversationLog::instanceExists()) { LLConversationLog::instance().cache(); - } + } + + clearSecHandler(); if (mPurgeCacheOnExit) { |