Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only determine DumpDir in one place, LLDir::getDumpDir, not in llcrashlogger.

Browse Source 
Also spaces tabs in getDumpDir
This commit is contained in:
Inusaito Sayori
2014-06-11 14:36:41 -04:00
parent 8766335708
commit 3cff5cd1a8
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/llvfs/lldir.cpp
View File

@@ -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;
}

2
indra/newview/llcrashlogger.cpp
View File

@@ -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))