summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2012-12-11 07:40:26 -0800
committerAura Linden <aura@lindenlab.com>2012-12-11 07:40:26 -0800
commit6b059d183b9516f45e775bde00f255cef8aab7c0 (patch)
treeed4d5828ecbdf25c5643e83184ca66934af09b71 /indra/mac_crash_logger
parent53ea30af06f94b5462fada7c4bfea3122b50ff95 (diff)
Crash reporter fixed, debugging removed.
Diffstat (limited to 'indra/mac_crash_logger')
-rw-r--r--indra/mac_crash_logger/llcrashloggermac.cpp11
-rw-r--r--indra/mac_crash_logger/mac_crash_logger.cpp17
2 files changed, 1 insertions, 27 deletions
diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp
index 64064d9cee..c5f660ca6e 100644
--- a/indra/mac_crash_logger/llcrashloggermac.cpp
+++ b/indra/mac_crash_logger/llcrashloggermac.cpp
@@ -66,32 +66,23 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles()
bool LLCrashLoggerMac::mainLoop()
{
- std::ofstream wlog;
- wlog.open("/Users/samantha/crashlogging1.txt");
- wlog << "SPATTERS mainloop.!\n";
-
if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND)
{
- wlog << "sending\n";
gSendReport = true;
}
if(gRememberChoice)
{
- wlog << "momento\n";
if(gSendReport) saveCrashBehaviorSetting(CRASH_BEHAVIOR_ALWAYS_SEND);
else saveCrashBehaviorSetting(CRASH_BEHAVIOR_NEVER_SEND);
}
if(gSendReport)
{
- wlog << "Send report!";
setUserText(gUserNotes);
sendCrashLogs();
}
-
- wlog.close();
-
+
return true;
}
diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 0d4f2855c7..6add74556f 100644
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -29,44 +29,27 @@
#include "indra_constants.h"
#include <iostream>
-#include <fstream>
-
int main(int argc, char **argv)
{
- std::ofstream wlog;
- wlog.open("/Users/samantha/crashlogging.txt");
- wlog << "SPATTERS starting crash reporter.!\n";
LLCrashLoggerMac app;
- wlog << "SPATTERS created app instance.!\n";
- for (int x=0;x<argc;++x) wlog << "SPATTERS arg " << x << " is '" << argv[x] << "'\n";
app.parseCommandOptions(argc, argv);
- wlog << "SPATTERS parsed commands.!\n";
if (! app.init())
{
- wlog << "SPATTERS failed to init.!\n";
-
llwarns << "Unable to initialize application." << llendl;
return 1;
}
if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND)
{
- wlog << "SPATTERS wanted to dialog.!\n";
-
-
// return NSApplicationMain(argc, (const char **)argv);
}
- wlog << "SPATTERS starting mainloop.!\n";
app.mainLoop();
- wlog << "SPATTERS finished main.!\n";
app.cleanup();
- wlog << "SPATTERS finished cleanup.!\n";
llinfos << "Crash reporter finished normally." << llendl;
- wlog.close();
return 0;
}