summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-05-28 14:51:34 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-05-28 14:51:34 -0700
commit648b55390709f832aac01b914ef4834e40c7b5f9 (patch)
treea9b680700068e9906e191cebc6f8344c4c5f8e0f /indra
parent3a6d903ce02c4d1b06b829ef88bd826e90fd74d0 (diff)
parentbca692a76dccca39ad9a67d87ddaf00ac74350fe (diff)
merge
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llappviewer.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 3528deb9e0..5f2e16ef12 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -607,9 +607,6 @@ bool LLAppViewer::init()
logdir += gDirUtilp->getDirDelimiter();
setMiniDumpDir(logdir);
- // remove any old minidump files from the log directory
- gDirUtilp->deleteFilesInDir(logdir, "*-*-*-*-*.dmp");
-
// Although initLogging() is the right place to mess with
// setFatalFunction(), we can't query gSavedSettings until after
// initConfiguration().
@@ -1234,6 +1231,14 @@ bool LLAppViewer::cleanup()
// workaround for DEV-35406 crash on shutdown
LLEventPumps::instance().reset();
+ // remove any old breakpad minidump files from the log directory
+ if (! isError())
+ {
+ std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "");
+ logdir += gDirUtilp->getDirDelimiter();
+ gDirUtilp->deleteFilesInDir(logdir, "*-*-*-*-*.dmp");
+ }
+
// *TODO - generalize this and move DSO wrangling to a helper class -brad
std::set<struct apr_dso_handle_t *>::const_iterator i;
for(i = mPlugins.begin(); i != mPlugins.end(); ++i)