Breakpad: now working Mac OS X

indra/newview/llappviewermacosx.cpp

@@ -69,19 +69,6 @@ namespace
 	}
 }
 
-static void exceptionTerminateHandler()
-{
-	// reinstall default terminate() handler in case we re-terminate.
-	if (gOldTerminateHandler) std::set_terminate(gOldTerminateHandler);
-	// treat this like a regular viewer crash, with nice stacktrace etc.
-    long *null_ptr;
-    null_ptr = 0;
-    *null_ptr = 0xDEADBEEF; //Force an exception that will trigger breakpad.
-	//LLAppViewer::handleViewerCrash();
-	// we've probably been killed-off before now, but...
-	gOldTerminateHandler(); // call old terminate() handler
-}
-
 int main( int argc, char **argv ) 
 {
 #if LL_SOLARIS && defined(__sparc)

indra/newview/viewer_manifest.py

@@ -522,7 +522,8 @@ class DarwinManifest(ViewerManifest):
                                 "libaprutil-1.0.dylib",
                                 "libcollada14dom.dylib",
                                 "libexpat.1.5.2.dylib",
-                                "libGLOD.dylib"):
+                                "libGLOD.dylib",
+                                "libexception_handler.dylib"):
                     self.path(os.path.join(libdir, libfile), libfile)
 
                 # For using FMOD for sound...but, fmod is proprietary so some might not use it...