diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-04-22 11:19:58 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-04-22 11:19:58 -0400 |
| commit | d0eb9658f2698b9c200991e84c1a60be48788e2c (patch) | |
| tree | daadf5ce47cf869d3b9937cb834b0fb63539853a /indra/newview/llappviewerwin32.cpp | |
| parent | ea7f34d37ac1861fc1e48e11ca5030e424a05a85 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (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(); |