diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-06-20 09:17:56 +0000 |
| commit | 8ed056fde9fe5fc9755158013a5cb8be73066e2c (patch) | |
| tree | d7f5f6de35c99ca645e48dc8817d908cc6d2f348 /indra/llcrashlogger | |
| parent | 351ebe9fcb76f3b99c2957004bb8493a904869ee (diff) | |
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
Diffstat (limited to 'indra/llcrashlogger')
| -rwxr-xr-x | indra/llcrashlogger/llcrashlogger.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |