From 8ed056fde9fe5fc9755158013a5cb8be73066e2c Mon Sep 17 00:00:00 2001
From: Adam Moss <moss@lindenlab.com>
Date: Sat, 20 Jun 2009 09:17:56 +0000
Subject: svn merge -r124872:124873
 svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-1.23.threefour-merge-1a

QAR-1592 Merge of changes between 1.23 RC2 and 1.23 Final to trunk
---
 indra/llcrashlogger/llcrashlogger.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'indra/llcrashlogger/llcrashlogger.cpp')

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 2fd37e848e..d83d9d18bf 100755
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -208,7 +208,10 @@ void LLCrashLogger::gatherFiles()
 		mFileMap["SettingsXml"] = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,"settings.xml");
 	}
 
+#if !LL_DARWIN
 	if(mCrashInPreviousExec)
+#else
+#endif
 	{
 		// Replace the log file ext with .old, since the 
 		// instance that launched this process has overwritten
-- 
cgit v1.2.3