summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewerwin32.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-04-14 15:11:42 -0700
committerAura Linden <aura@lindenlab.com>2014-04-14 15:11:42 -0700
commite5dae42252432d5a6d4453a767b1c3a9508deb32 (patch)
treede9639a8cdd60895ca6a051f17ae7ba8beabee17 /indra/newview/llappviewerwin32.cpp
parent7e966f28da79d2d24f93a2615c8807421300700c (diff)
Fix for MAINT-5707 bad breakpad behavior with teleport links
Diffstat (limited to 'indra/newview/llappviewerwin32.cpp')
-rw-r--r--indra/newview/llappviewerwin32.cpp2
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();