summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-04-08 11:32:48 -0400
committerOz Linden <oz@lindenlab.com>2016-04-08 11:32:48 -0400
commited38b5c9235b35cc4aa7448be2897c5fffbc684e (patch)
tree5091ca719379258f0cc22f3866bdc757d1727b36 /indra/mac_crash_logger
parentf0107eb8aae46a928b0b3e6564cc4ed3031e1271 (diff)
parent2446fab3746bfef453ec8e3d5a31b30e8f3f91e1 (diff)
merge changes for MAINT-5974
Diffstat (limited to 'indra/mac_crash_logger')
-rw-r--r--indra/mac_crash_logger/llcrashloggermac.cpp9
-rw-r--r--indra/mac_crash_logger/mac_crash_logger.cpp11
2 files changed, 9 insertions, 11 deletions
diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp
index 351009814d..3149fad6e8 100644
--- a/indra/mac_crash_logger/llcrashloggermac.cpp
+++ b/indra/mac_crash_logger/llcrashloggermac.cpp
@@ -66,22 +66,19 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles()
bool LLCrashLoggerMac::mainLoop()
{
+
if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND)
{
gSendReport = true;
}
- if(gRememberChoice)
- {
- if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND);
- else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND);
- }
-
if(gSendReport)
{
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 b65a80331e..72f4ede999 100644
--- 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")))
- {
- LL_WARNS() << "Insufficient parameters to crash report." << LL_ENDL;
- }
-
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);