Fix log file inclusion; include SecondLife.log on crash, but SecondLife.old on freeze.

1 files changed, 10 insertions, 6 deletions

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index aa2ea17af9..078795f962 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -190,12 +190,16 @@ void LLCrashLogger::gatherFiles()
 		mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
 	}
 
-	// Replace the log file ext with .old, since the 
-	// instance that launched this process has overwritten
-	// SecondLife.log
-	std::string log_filename = mFileMap["SecondLifeLog"];
-	log_filename.replace(log_filename.size() - 4, 4, ".old");
-	mFileMap["SecondLifeLog"] = log_filename;
+	if(mCrashInPreviousExec)
+	{
+		// Restarting after freeze.
+		// Replace the log file ext with .old, since the 
+		// instance that launched this process has overwritten
+		// SecondLife.log
+		std::string log_filename = mFileMap["SecondLifeLog"];
+		log_filename.replace(log_filename.size() - 4, 4, ".old");
+		mFileMap["SecondLifeLog"] = log_filename;
+	}
 
 	gatherPlatformSpecificFiles();