diff options
| author | Callum Prentice <callum@lindenlab.com> | 2021-10-13 14:47:06 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2021-10-13 14:47:06 -0700 |
| commit | 8a1bc1b9e299077a77bc8498555667adcb387655 (patch) | |
| tree | 4b5a8b329148e5bd86bec785edda6a6f79016d37 /indra/newview/llappviewer.cpp | |
| parent | c50db007dfdeecae5c3451fbb188584588c23c47 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge with head of Master after a new Viewer release
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 146d2899e7..2f494d306d 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); } @@ -2006,7 +2006,9 @@ bool LLAppViewer::cleanup() if (LLConversationLog::instanceExists()) { LLConversationLog::instance().cache(); - } + } + + clearSecHandler(); if (mPurgeCacheOnExit) { |