diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index b7e2f17c464a16b95f7cca5dfde944f7bfe364e9..c308663a620d5995a82a55b730aae01c4b2fb390 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1160,7 +1160,10 @@ bool LLAppViewer::init()
 	updater.args.add(stringize(gSavedSettings.getU32("ForceAddressSize")));
 
 	// Run the updater. An exception from launching the updater should bother us.
-	LLLeap::create(updater, true);
+	if (!beingDebugged())
+	{
+		LLLeap::create(updater, true);
+	}
 
 	// Iterate over --leap command-line options. But this is a bit tricky: if
 	// there's only one, it won't be an array at all.