diff options
author | Aura Linden <aura@lindenlab.com> | 2014-04-15 10:32:13 -0700 |
---|---|---|
committer | Aura Linden <aura@lindenlab.com> | 2014-04-15 10:32:13 -0700 |
commit | e9976b07f902ab23032d5c8bae78b4eabd20b9d0 (patch) | |
tree | 32dee5b9f8f7780f3b82caa6d1c9fdc51ec02b27 /indra/newview | |
parent | 828ff16183f4ac88dadaddb785c66a5df32572b6 (diff) | |
parent | e5dae42252432d5a6d4453a767b1c3a9508deb32 (diff) |
Merges in fix for Maint-5707
Diffstat (limited to 'indra/newview')
-rwxr-xr-x | indra/newview/llappviewer.cpp | 2 | ||||
-rwxr-xr-x | indra/newview/llappviewer.h | 1 | ||||
-rw-r--r-- | indra/newview/llappviewerwin32.cpp | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 63d31824e4..413a0abf47 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -740,7 +740,7 @@ public: bool LLAppViewer::init() { - setupErrorHandling(); + setupErrorHandling(mSecondInstance); // // Start of the application diff --git a/indra/newview/llappviewer.h b/indra/newview/llappviewer.h index cbaa7bc4c2..25b5c90bb0 100755 --- a/indra/newview/llappviewer.h +++ b/indra/newview/llappviewer.h @@ -80,6 +80,7 @@ public: bool quitRequested() { return mQuitRequested; } bool logoutRequestSent() { return mLogoutRequestSent; } + bool isSecondInstance() { return mSecondInstance; } void writeDebugInfo(bool isStatic=true); 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(); |