diff options
| author | Baker Linden <baker@lindenlab.com> | 2014-04-24 10:19:03 -0700 |
|---|---|---|
| committer | Baker Linden <baker@lindenlab.com> | 2014-04-24 10:19:03 -0700 |
| commit | 5bd41620d986e073e49255d9075093541e2a9ffe (patch) | |
| tree | 950443ba5447703e5718990b45b98591c6dc1f74 /indra/newview/llappviewerwin32.cpp | |
| parent | 1ca5dd40765211dc993393caa0003cfa7505c1f5 (diff) | |
| parent | c71e459bed68c1602d409e5c946c5e016d09d105 (diff) | |
viewer-release 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(); |