Pull merge from lindenlab/viewer-release

2 files changed, 12 insertions, 0 deletions

diff --git a/indra/linux_crash_logger/linux_crash_logger.cpp b/indra/linux_crash_logger/linux_crash_logger.cpp
index 99d0ad7e14..d4e7ad7be3 100755
--- a/indra/linux_crash_logger/linux_crash_logger.cpp
+++ b/indra/linux_crash_logger/linux_crash_logger.cpp
@@ -26,6 +26,7 @@
 
 #include "linden_common.h"
 #include "llcrashloggerlinux.h"
+#include "llsdutil.h"
 
 int main(int argc, char **argv)
 {
@@ -34,6 +35,16 @@ int main(int argc, char **argv)
 	LLCrashLoggerLinux app;
 	app.parseCommandOptions(argc, argv);
 
+    LLSD options = LLApp::instance()->getOptionData(
+                        LLApp::PRIORITY_COMMAND_LINE);
+                        //LLApp::PRIORITY_RUNTIME_OVERRIDE);
+
+    
+    if (!(options.has("pid") && options.has("dumpdir")))
+    {
+        llwarns << "Insufficient parameters to crash report." << llendl;
+    }
+
 	if (! app.init())
 	{
 		llwarns << "Unable to initialize application." << llendl;
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 62465f9937..871d6377cb 100755
--- a/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -136,6 +136,7 @@ bool LLCrashLoggerLinux::mainLoop()
 bool LLCrashLoggerLinux::cleanup()
 {
 	commonCleanup();
+    mKeyMaster.releaseMaster();
 	return true;
 }