Crash reporter fixed, debugging removed.

4 files changed, 2 insertions, 42 deletions

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 008b0e04b5..34e25a8a71 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -339,10 +339,6 @@ bool LLCrashLogger::runCrashLogPost(std::string host, LLSD data, std::string msg
 
 bool LLCrashLogger::sendCrashLogs()
 {
-    std::ofstream wlog;
-    wlog.open("/Users/samantha/crashlogging2.txt");
-    wlog << "SPATTERS sendingCrashLogs.!\n";
-
 	gatherFiles();
 
 	LLSD post_data;
@@ -354,7 +350,6 @@ bool LLCrashLogger::sendCrashLogs()
 														   "SecondLifeCrashReport");
 	std::string report_file = dump_path + ".log";
 
-    wlog << "SPATTERS looking in dump_path " << dump_path << " report_file " << report_file << "\n";
 	std::ofstream out_file(report_file.c_str());
 	LLSDSerialize::toPrettyXML(post_data, out_file);
 	out_file.close();
@@ -364,18 +359,14 @@ bool LLCrashLogger::sendCrashLogs()
 	//*TODO: Translate
 	if(mCrashHost != "")
 	{
-        wlog << "SPATTERS sending to MAIN host " << mCrashHost << "\n";
 		sent = runCrashLogPost(mCrashHost, post_data, std::string("Sending to server"), 3, 5);
 	}
 
 	if(!sent)
 	{
-        wlog << "SPATTERS sending to MAIN host " << mAltCrashHost << "\n";
 		sent = runCrashLogPost(mAltCrashHost, post_data, std::string("Sending to alternate server"), 3, 5);
 	}
-	
-    wlog.close();
-    
+	    
 	mSentCrashLogs = sent;
 
 	return true;
@@ -403,7 +394,6 @@ bool LLCrashLogger::init()
 	// Rename current log file to ".old"
 	std::string old_log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log.old");
 	std::string log_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "crashreport.log");
-    llinfos << "SPATTERS moving " << log_file << " to " << old_log_file <<llendl;
 	LLFile::rename(log_file.c_str(), old_log_file.c_str());
 
 	// Set the log file to crashreport.log
@@ -425,7 +415,6 @@ bool LLCrashLogger::init()
 		return false;
 	}
 
-    llinfos << "SPATTERS gets to here 1" << llendl;
 	gServicePump = new LLPumpIO(gAPRPoolp);
 	gServicePump->prime(gAPRPoolp);
 	LLHTTPClient::setPump(*gServicePump);
diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm
index 61cfad99d6..16cfefda26 100644
--- a/indra/llvfs/llvfs_objc.mm
+++ b/indra/llvfs/llvfs_objc.mm
@@ -51,9 +51,6 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory,
                                                          YES);
     if ([paths count])
     {
-        //NSString *bundleName = @"SecondLife";
-        //[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"];
-        //path = [[paths objectAtIndex:0] stringByAppendingPathComponent:bundleName];
         path = [paths objectAtIndex:0];
         //SPATTERS HACK:  Always attempt to create directory, ignore errors.
         NSError *error = nil;
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;
 }