From 44d511669ba85a0311dc8d0901f22a1f38c0790b Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Mon, 12 Nov 2012 16:25:09 -0800
Subject: Pulled cocoa crash reporter changes from old branch.

---
 indra/mac_crash_logger/mac_crash_logger.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'indra/mac_crash_logger/mac_crash_logger.cpp')

diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 6571b35241..4d0a7af27f 100644
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -26,9 +26,18 @@
 
 #include "linden_common.h"
 #include "llcrashloggermac.h"
+#include "indra_constants.h"
 
+#include <iostream>
+#include <fstream>
+
+    
 int main(int argc, char **argv)
 {
+    std::ofstream outputFile;
+    outputFile.open("/tmp/aura.txt");
+    outputFile << "TEstiNG" << std::endl;
+    llinfos << "SPATTERS ASDFSDFSDF" << llendl;
 	llinfos << "Starting crash reporter." << llendl;
 
 	LLCrashLoggerMac app;
@@ -39,9 +48,16 @@ int main(int argc, char **argv)
 		llwarns << "Unable to initialize application." << llendl;
 		return 1;
 	}
-
+    if (app.getCrashBehavior() != CRASH_BEHAVIOR_ALWAYS_SEND)
+    {
+        
+//        return NSApplicationMain(argc, (const char **)argv);
+    }
 	app.mainLoop();
 	app.cleanup();
 	llinfos << "Crash reporter finished normally." << llendl;
+    
+    outputFile.close();
+    
 	return 0;
 }
-- 
cgit v1.2.3


From 1149c94c5b5008f6c076ce4b072f54e48c4783ae Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Thu, 29 Nov 2012 23:33:31 -0800
Subject: Crashlogger only runs when it comes from teamcity so I must checkin
 debug and wait.  What fun.

---
 indra/mac_crash_logger/mac_crash_logger.cpp | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'indra/mac_crash_logger/mac_crash_logger.cpp')

diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 4d0a7af27f..5e6806c08e 100644
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -34,12 +34,6 @@
     
 int main(int argc, char **argv)
 {
-    std::ofstream outputFile;
-    outputFile.open("/tmp/aura.txt");
-    outputFile << "TEstiNG" << std::endl;
-    llinfos << "SPATTERS ASDFSDFSDF" << llendl;
-	llinfos << "Starting crash reporter." << llendl;
-
 	LLCrashLoggerMac app;
 	app.parseCommandOptions(argc, argv);
 
@@ -57,7 +51,5 @@ int main(int argc, char **argv)
 	app.cleanup();
 	llinfos << "Crash reporter finished normally." << llendl;
     
-    outputFile.close();
-    
 	return 0;
 }
-- 
cgit v1.2.3


From 53ea30af06f94b5462fada7c4bfea3122b50ff95 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Tue, 11 Dec 2012 06:56:14 -0800
Subject: Interim debug checkin to test from teamcity

---
 indra/mac_crash_logger/mac_crash_logger.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'indra/mac_crash_logger/mac_crash_logger.cpp')

diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 5e6806c08e..0d4f2855c7 100644
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -34,22 +34,39 @@
     
 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;
 }
-- 
cgit v1.2.3


From 6b059d183b9516f45e775bde00f255cef8aab7c0 Mon Sep 17 00:00:00 2001
From: Aura Linden <aura@lindenlab.com>
Date: Tue, 11 Dec 2012 07:40:26 -0800
Subject: Crash reporter fixed, debugging removed.

---
 indra/mac_crash_logger/mac_crash_logger.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'indra/mac_crash_logger/mac_crash_logger.cpp')

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;
 }
-- 
cgit v1.2.3