diff options
| author | Callum Linden <callum@lindenlab.com> | 2021-10-13 16:54:08 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2021-10-13 16:54:08 -0700 |
| commit | 3c2ccd879cb59ac0fdcacfab1fe68bc4dcefc68b (patch) | |
| tree | 3a0851d0c1d77fcd6ffa948f9c6199640b7147dd /indra/newview/llappviewer.cpp | |
| parent | 3a3296f371508c4a31a37053242ee69a574f22f0 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge with master after latest 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 298b2ebbe9..68e0a910aa 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -730,7 +730,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) { |