From 44f5d7320952de2c4c7e1062b1c02c2f521400fa Mon Sep 17 00:00:00 2001 From: Jonathan Yap Date: Thu, 20 Nov 2014 16:25:11 -0500 Subject: STORM-2086 Convert old style llinfos and llwarns to new format --- indra/mac_crash_logger/mac_crash_logger.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/mac_crash_logger') diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index d6b913829e..b65a80331e 100755 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -41,7 +41,7 @@ int main(int argc, char **argv) if (!(options.has("pid") && options.has("dumpdir"))) { - llwarns << "Insufficient parameters to crash report." << llendl; + LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL; } if (! app.init()) -- cgit v1.2.3 From b09f0a120e53c8b27d196df6a33a42c9ac0e146c Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Wed, 16 Sep 2015 14:21:03 -0700 Subject: maint-5422 changes and merge from release --- indra/mac_crash_logger/llcrashloggermac.cpp | 3 +++ indra/mac_crash_logger/mac_crash_logger.cpp | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'indra/mac_crash_logger') diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index 351009814d..ed64ebdb8c 100755 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -66,6 +66,7 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles() bool LLCrashLoggerMac::mainLoop() { + if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND) { gSendReport = true; @@ -82,6 +83,8 @@ bool LLCrashLoggerMac::mainLoop() setUserText(gUserNotes); sendCrashLogs(); } + + LL_INFOS() << "Sending of logs complete" << LL_ENDL; return true; } diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index d6b913829e..72f4ede999 100755 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -39,16 +39,17 @@ int main(int argc, char **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()) { LL_WARNS() << "Unable to initialize application." << LL_ENDL; return 1; } + + if (!(options.has("pid") && options.has("dumpdir"))) + { + LL_WARNS() << "Insufficient parameters to crash report." << llendl; + } + if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND) { // return NSApplicationMain(argc, (const char **)argv); -- cgit v1.2.3 From c8726aba303bcf1207b730a344536e25491420bc Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Tue, 10 Nov 2015 09:48:56 -0500 Subject: remove execute permission from many files that should not have it --- indra/mac_crash_logger/CMakeLists.txt | 0 indra/mac_crash_logger/Info.plist | 0 indra/mac_crash_logger/llcrashloggermac.cpp | 0 indra/mac_crash_logger/llcrashloggermac.h | 0 indra/mac_crash_logger/llcrashloggermacdelegate.h | 0 indra/mac_crash_logger/llcrashloggermacdelegate.mm | 0 indra/mac_crash_logger/mac_crash_logger.cpp | 0 7 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 indra/mac_crash_logger/CMakeLists.txt mode change 100755 => 100644 indra/mac_crash_logger/Info.plist mode change 100755 => 100644 indra/mac_crash_logger/llcrashloggermac.cpp mode change 100755 => 100644 indra/mac_crash_logger/llcrashloggermac.h mode change 100755 => 100644 indra/mac_crash_logger/llcrashloggermacdelegate.h mode change 100755 => 100644 indra/mac_crash_logger/llcrashloggermacdelegate.mm mode change 100755 => 100644 indra/mac_crash_logger/mac_crash_logger.cpp (limited to 'indra/mac_crash_logger') diff --git a/indra/mac_crash_logger/CMakeLists.txt b/indra/mac_crash_logger/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/indra/mac_crash_logger/Info.plist b/indra/mac_crash_logger/Info.plist old mode 100755 new mode 100644 diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp old mode 100755 new mode 100644 diff --git a/indra/mac_crash_logger/llcrashloggermac.h b/indra/mac_crash_logger/llcrashloggermac.h old mode 100755 new mode 100644 diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.h b/indra/mac_crash_logger/llcrashloggermacdelegate.h old mode 100755 new mode 100644 diff --git a/indra/mac_crash_logger/llcrashloggermacdelegate.mm b/indra/mac_crash_logger/llcrashloggermacdelegate.mm old mode 100755 new mode 100644 diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp old mode 100755 new mode 100644 -- cgit v1.2.3 From 442c4842ab3cbdea8726ec425c55102caaa2033a Mon Sep 17 00:00:00 2001 From: Glenn Glazer Date: Tue, 8 Mar 2016 08:09:11 -0800 Subject: maint-5974/maint-5422: viewer changes for new crash reporting, remove no send logic --- indra/mac_crash_logger/llcrashloggermac.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'indra/mac_crash_logger') diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp index ed64ebdb8c..3149fad6e8 100755 --- a/indra/mac_crash_logger/llcrashloggermac.cpp +++ b/indra/mac_crash_logger/llcrashloggermac.cpp @@ -72,12 +72,6 @@ bool LLCrashLoggerMac::mainLoop() gSendReport = true; } - if(gRememberChoice) - { - if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND); - else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND); - } - if(gSendReport) { setUserText(gUserNotes); -- cgit v1.2.3 From 57488bc3812d9d308cc9e869c2088ba8212bc851 Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Wed, 13 Apr 2016 14:41:38 -0400 Subject: add logging around crash reporting, with minor code cleanups --- indra/mac_crash_logger/mac_crash_logger.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'indra/mac_crash_logger') diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp index 72f4ede999..95d4e65207 100644 --- a/indra/mac_crash_logger/mac_crash_logger.cpp +++ b/indra/mac_crash_logger/mac_crash_logger.cpp @@ -45,11 +45,6 @@ int main(int argc, char **argv) return 1; } - if (!(options.has("pid") && options.has("dumpdir"))) - { - LL_WARNS() << "Insufficient parameters to crash report." << llendl; - } - if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND) { // return NSApplicationMain(argc, (const char **)argv); -- cgit v1.2.3