summaryrefslogtreecommitdiff
path: root/indra/llcrashlogger
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-03-20 12:04:39 -0700
committerAura Linden <aura@lindenlab.com>2014-03-20 12:04:39 -0700
commit35ab71d8ea85ff43f1940bc582bb5bbb8f52d6df (patch)
tree400a390cad5b87aa1f7790746760d90eae90544b /indra/llcrashlogger
parent8d5b933ad0c1b96778d0460f142ceadaf4be11fb (diff)
Returned Secondlife.log to main directory due to unforeseen LLErrorThread complexities.
Diffstat (limited to 'indra/llcrashlogger')
-rwxr-xr-xindra/llcrashlogger/llcrashlogger.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index a48c475e85..df6ed5a8f0 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -218,7 +218,7 @@ void LLCrashLogger::gatherFiles()
{
// Figure out the filename of the second life log
LLCurl::setCAFile(gDirUtilp->getCAFile());
- mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_DUMP,"SecondLife.log");
+ mFileMap["SecondLifeLog"] = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.old"); //We want the log of the last run now.
mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
}
@@ -477,12 +477,6 @@ bool LLCrashLogger::sendCrashLogs()
else
{
//mCrashInfo["DebugLog"].erase("MinidumpPath");
- //To preserve logfile on clean shutdown move to regular log dir.
- std::string curr_log = (*lock)["dumpdir"].asString() + "SecondLife.log";
- std::string last_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.log");
-
- LLFile::remove(last_log);
- LLFile::rename(curr_log, last_log); //Before we blow away the directory, perserve log of previous run.
mKeyMaster.cleanupProcess((*lock)["dumpdir"].asString());
}