1 files changed, 29 insertions, 1 deletions
diff --git a/indra/newview/llappviewerwin32.cpp b/indra/newview/llappviewerwin32.cpp
index 814c209e67..09bcf6f7cc 100644
--- a/indra/newview/llappviewerwin32.cpp
+++ b/indra/newview/llappviewerwin32.cpp
@@ -127,7 +127,14 @@ LONG WINAPI viewer_windows_exception_handler(struct _EXCEPTION_POINTERS *excepti
 	return retval;
 }
 
-int APIENTRY WinMain(HINSTANCE hInstance,
+
+#if DEBUGGING_SEH_FILTER
+#	define WINMAIN DebuggingWinMain
+#else
+#	define WINMAIN WinMain
+#endif
+
+int APIENTRY WINMAIN(HINSTANCE hInstance,
                      HINSTANCE hPrevInstance,
                      LPSTR     lpCmdLine,
                      int       nCmdShow)
@@ -207,6 +214,27 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 	return 0;
 }
 
+#if DEBUGGING_SEH_FILTER
+// The compiler doesn't like it when you use __try/__except blocks
+// in a method that uses object destructors. Go figure.
+// This winmain just calls the real winmain inside __try.
+// The __except calls our exception filter function. For debugging purposes.
+int APIENTRY WinMain(HINSTANCE hInstance,
+                     HINSTANCE hPrevInstance,
+                     LPSTR     lpCmdLine,
+                     int       nCmdShow)
+{
+    __try
+    {
+        WINMAIN(hInstance, hPrevInstance, lpCmdLine, nCmdShow);
+    }
+    __except( viewer_windows_exception_handler( GetExceptionInformation() ) )
+    {
+        _tprintf( _T("Exception handled.\n") );
+    }
+}
+#endif
+
 void LLAppViewerWin32::disableWinErrorReporting()
 {
 	const char win_xp_string[] = "Microsoft Windows XP";