Pull merge from lindenlab/viewer-release

2 files changed, 10 insertions, 2 deletions

diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp
index c5f660ca6e..351009814d 100755
--- a/indra/mac_crash_logger/llcrashloggermac.cpp
+++ b/indra/mac_crash_logger/llcrashloggermac.cpp
@@ -89,5 +89,6 @@ bool LLCrashLoggerMac::mainLoop()
 bool LLCrashLoggerMac::cleanup()
 {
 	commonCleanup();
+    mKeyMaster.releaseMaster();
 	return true;
 }
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 6add74556f..2c83f3439d 100755
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -27,6 +27,7 @@
 #include "linden_common.h"
 #include "llcrashloggermac.h"
 #include "indra_constants.h"
+#include "llpidlock.h"
 
 #include <iostream>
     
@@ -35,6 +36,14 @@ int main(int argc, char **argv)
 	LLCrashLoggerMac app;
 	app.parseCommandOptions(argc, argv);
 
+    LLSD options = LLApp::instance()->getOptionData(
+                        LLApp::PRIORITY_COMMAND_LINE);
+    
+    if (!(options.has("pid") && options.has("dumpdir")))
+    {
+        llwarns << "Insufficient parameters to crash report." << llendl;
+    }
+    
 	if (! app.init())
 	{
 		llwarns << "Unable to initialize application." << llendl;
@@ -44,9 +53,7 @@ int main(int argc, char **argv)
     {
 //        return NSApplicationMain(argc, (const char **)argv);
     }
-
 	app.mainLoop();
-
 	app.cleanup();
 
 	llinfos << "Crash reporter finished normally." << llendl;