summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger
diff options
context:
space:
mode:
authorGlenn Glazer <coyot@lindenlab.com>2016-02-25 10:34:18 -0800
committerGlenn Glazer <coyot@lindenlab.com>2016-02-25 10:34:18 -0800
commitaca314de1f74bc4cab06dfc4b99e6604213b22b5 (patch)
tree5a30de3ebd0828c22a7edbd314c38ff011c77703 /indra/mac_crash_logger
parent281521fe42facc08c00ea6df902e31a6749d6eea (diff)
parentb09f0a120e53c8b27d196df6a33a42c9ac0e146c (diff)
maint-5974/maint-5422: viewer changes for new crash reporting
Diffstat (limited to 'indra/mac_crash_logger')
-rwxr-xr-xindra/mac_crash_logger/llcrashloggermac.cpp3
-rwxr-xr-xindra/mac_crash_logger/mac_crash_logger.cpp11
2 files changed, 9 insertions, 5 deletions
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);