From e5dae42252432d5a6d4453a767b1c3a9508deb32 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Mon, 14 Apr 2014 15:11:42 -0700
Subject: Fix for MAINT-5707 bad breakpad behavior with teleport links

---
 indra/newview/llappviewerwin32.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llappviewerwin32.cpp')

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();
-- 
cgit v1.2.3