From 3cff5cd1a869716f7ac20b0a6b47a6370cf5d887 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Wed, 11 Jun 2014 14:36:41 -0400 Subject: [PATCH] Only determine DumpDir in one place, LLDir::getDumpDir, not in llcrashlogger. Also spaces tabs in getDumpDir --- indra/llvfs/lldir.cpp | 20 ++++++++++---------- indra/newview/llcrashlogger.cpp | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index e0d85a477..26c5c11b7 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -301,19 +301,19 @@ void LLDir::setDumpDir( const std::string& path ) const std::string &LLDir::getDumpDir() const { - if (sDumpDir.empty() ) - { + if (sDumpDir.empty() ) + { /* Singu Note: don't generate a different dump dir each time - LLUUID uid; - uid.generate(); - - sDumpDir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "") - + "dump-" + uid.asString(); + LLUUID uid; + uid.generate(); + + sDumpDir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "") + + "dump-" + uid.asString(); */ - sDumpDir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "") + "singularity-debug"; - dir_exists_or_crash(sDumpDir); - } + sDumpDir = getExpandedFilename(LL_PATH_LOGS, "") + "singularity-debug"; + dir_exists_or_crash(sDumpDir); + } return LLDir::sDumpDir; } diff --git a/indra/newview/llcrashlogger.cpp b/indra/newview/llcrashlogger.cpp index cf06a402d..1e9e66951 100644 --- a/indra/newview/llcrashlogger.cpp +++ b/indra/newview/llcrashlogger.cpp @@ -396,7 +396,7 @@ void LLCrashLogger::checkCrashDump() if (pref == 2) return; //never send mCrashHost = gSavedSettings.getString("CrashHostUrl"); - std::string dumpDir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "") + "singularity-debug"; + std::string dumpDir = gDirUtilp->getDumpDir(); // Do we have something to send, and somewhere to send it if (!mCrashHost.empty() && miniDumpExists(dumpDir))