diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e74ee7154f89e80baf9491ecc00c19ecaa14f55c..5f4355ce6c3ced22cf25052188904984aba07def 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1110,7 +1110,10 @@ bool LLAppViewer::init()
 		// situation to do things the Right Way. Anyone who intentionally
 		// bypasses this mechanism needs no reminder that s/he's shooting
 		// him/herself in the foot.
-		LLNotificationsUtil::add("RunLauncher");
+		if (!beingDebugged())
+		{
+			LLNotificationsUtil::add("RunLauncher");
+		}
 	}
 
 #if LL_WINDOWS
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 48b3a1c485a46635bc6e15f5ae13bd5e632c9c54..de764ae300002a604af5a5ad93fe9c8a9ca3adb1 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -646,6 +646,11 @@ bool LLAppViewerWin32::initParseCommandLine(LLCommandLineParser& clp)
 	return true;
 }
 
+bool LLAppViewerWin32::beingDebugged()
+{
+    return IsDebuggerPresent();
+}
+
 bool LLAppViewerWin32::restoreErrorTrap()
 {	
 	return true;
diff --git a/indra/newview/llappviewerwin32.h b/indra/newview/llappviewerwin32.h
index 59d1ddaa3df21d661e03789da7e58428a3f7e355..c5fae6a3a3bd581498de4b69fc669bdd91617e22 100644
--- a/indra/newview/llappviewerwin32.h
+++ b/indra/newview/llappviewerwin32.h
@@ -49,6 +49,7 @@ protected:
 	virtual bool initHardwareTest(); // Win32 uses DX9 to test hardware.
 	virtual bool initParseCommandLine(LLCommandLineParser& clp);
 
+	virtual bool beingDebugged();
 	virtual bool restoreErrorTrap();
 	virtual void initCrashReporting(bool reportFreeze);