diff options
| author | Cinder Biscuits <cinder.roxley@phoenixviewer.com> | 2014-04-27 23:20:12 -0600 |
|---|---|---|
| committer | Cinder Biscuits <cinder.roxley@phoenixviewer.com> | 2014-04-27 23:20:12 -0600 |
| commit | 12ca15d18fd82b85eb38166d1d58cd8803f5c7cf (patch) | |
| tree | feba43a0660b7d63c5cd75fb03041232558c303e /indra/newview/llappviewerwin32.cpp | |
| parent | 60795c508ee8baa5e21dee7dd990a5276cc02176 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
| -rw-r--r-- | indra/newview/llappviewerwin32.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp index d9a0eb25e4..5585bd914c 100644 --- a/indra/newview/llappviewerwin32.cpp +++ b/indra/newview/llappviewerwin32.cpp @@ -674,6 +674,8 @@ bool LLAppViewerWin32::restoreErrorTrap() void LLAppViewerWin32::initCrashReporting(bool reportFreeze) { + if (isSecondInstance()) return; //BUG-5707 do not start another crash reporter for second instance. + const char* logger_name = "win_crash_logger.exe"; std::string exe_path = gDirUtilp->getExecutableDir(); exe_path += gDirUtilp->getDirDelimiter(); |