From d83c51a4e1923508e31f25576761f001d731ea93 Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 14 Aug 2013 21:58:30 -0700 Subject: BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macros --- indra/mac_crash_logger/mac_crash_logger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp') diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 6add74556f..a5f349fd0b 100755 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -37,7 +37,7 @@ int main(int argc, char **argv) if (! app.init()) { - llwarns << "Unable to initialize application." << llendl; + LL_WARNS() << "Unable to initialize application." << LL_ENDL; return 1; } if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND) @@ -49,7 +49,7 @@ int main(int argc, char **argv) app.cleanup(); - llinfos << "Crash reporter finished normally." << llendl; + LL_INFOS() << "Crash reporter finished normally." << LL_ENDL; return 0; } -- cgit v1.2.3 From 680934812598d2c9116303f3245e7a9d60ff58bf Mon Sep 17 00:00:00 2001 From: Aura Linden Date: Tue, 3 Dec 2013 17:06:06 -0800 Subject: Creating a cleaner branch --- indra/mac_crash_logger/mac_crash_logger.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'indra/mac_crash_logger/mac_crash_logger.cpp') 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 @@ -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; -- cgit v1.2.3