diff --git a/.hgpatchinfo/Viewer-Build.desc b/.hgpatchinfo/Viewer-Build.desc
index 122ab7adfb0bd76015d188aa979183b7e09ebf72..f784e6d74181e7b81d2aa948f5760546b03299f4 100644
--- a/.hgpatchinfo/Viewer-Build.desc
+++ b/.hgpatchinfo/Viewer-Build.desc
@@ -1,5 +1,7 @@
 [Viewer/Build]
-- changed  : compiler options for "Release with Debug" builds
-- changed  : compiler and linker options for "Release" builds
-- added    : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions
-- changed  : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases
+- changed : compiler options for "Release with Debug" builds
+- changed : compiler and linker options for "Release" builds
+- added   : imported SNOW-788 - Fix boost lib detection with Visual Studio to allow multiple VS versions
+- changed : removed LL's changeset tags and added new (consistent) SL-2.X.Y tags for releases
+- changed : break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds
+    -> Windows only
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index 6c07974f69bc6cc52345056b50740673b16ebffc..531d03dff8dea70116404f86961a80ff94d1d9a3 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -1792,7 +1792,14 @@ void errorCallback(const std::string &error_string)
 	//Set the ErrorActivated global so we know to create a marker file
 	gLLErrorActivated = true;
 	
+//	LLError::crashAndLoop(error_string);
+// [SL:KB] - Patch: Viewer-Build | Checked: 2010-12-04 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
+#if !LL_RELEASE_FOR_DOWNLOAD && LL_WINDOWS
+	DebugBreak();
+#else
 	LLError::crashAndLoop(error_string);
+#endif // LL_RELEASE_WITH_DEBUG_INFO && LL_WINDOWS
+// [/SL:KB]
 }
 
 bool LLAppViewer::initLogging()