diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:32 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-10-14 00:52:32 +0300 |
| commit | d734105446182b17a91f6590eaa23ac690032817 (patch) | |
| tree | cce54f1d1347c63100d9edef2fe942bab2f51b5e /indra/newview/llappviewer.cpp | |
| parent | 2f5d44f4b6e029be0593fe46151f8d25c4fa11d3 (diff) | |
| parent | cbaba2df56c66926e051d50b6cb02955c81c2a6c (diff) | |
Merge branch 'master' into DRTVWR-486
# Conflicts:
# indra/newview/VIEWER_VERSION.txt
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 891722e1bd..69606793db 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) { |