diff options
| author | Cho <cho@lindenlab.com> | 2014-04-24 23:44:47 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-04-24 23:44:47 +0100 |
| commit | 6cc318fda28a878186d35c79bf5474d4d1ac66d3 (patch) | |
| tree | 2cc623f32ec473931403613ca17ea9873938ed9b /indra/newview/llappviewerwin32.cpp | |
| parent | 446a3193b1f2932ed14a16216bcf65dc30889612 (diff) | |
| parent | 80fcd6d9d42377fc09928eb99f26e6287c4b544d (diff) | |
merge
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(); |