summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-10-13 21:56:36 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-10-13 21:56:36 +0000
commit0fa3d7705fb6a42410d1578b1fab5b7952a59e7c (patch)
tree72c71a57659a7068f291426cb5235cb68d3436c9 /indra/newview/llappviewer.cpp
parent492ea7c3a03d5ef0d3679b873a44c08baaced0f1 (diff)
parente989b79dae7b7128c6ce4580b6731dcd3347b94e (diff)
Merged in DV528-merge-6.4.24 (pull request #729)
DRTVWR-528 merge up to v 6.4.24
Diffstat (limited to 'indra/newview/llappviewer.cpp')
-rw-r--r--indra/newview/llappviewer.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index f68717ef9f..4a33563f3f 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -738,7 +738,7 @@ LLAppViewer::LLAppViewer()
std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_DUMP, "");
# endif // ! LL_BUGSPLAT
mDumpPath = logdir;
- setMiniDumpDir(logdir);
+
setDebugFileNames(logdir);
}
@@ -2003,7 +2003,9 @@ bool LLAppViewer::cleanup()
if (LLConversationLog::instanceExists())
{
LLConversationLog::instance().cache();
- }
+ }
+
+ clearSecHandler();
if (mPurgeCacheOnExit)
{