merge up to 3.4.4 beta

1 files changed, 10 insertions, 2 deletions

diff --git a/indra/mac_crash_logger/mac_crash_logger.cpp b/indra/mac_crash_logger/mac_crash_logger.cpp
index 6571b35241..6add74556f 100644
--- a/indra/mac_crash_logger/mac_crash_logger.cpp
+++ b/indra/mac_crash_logger/mac_crash_logger.cpp
@@ -26,11 +26,12 @@
 
 #include "linden_common.h"
 #include "llcrashloggermac.h"
+#include "indra_constants.h"
 
+#include <iostream>
+    
 int main(int argc, char **argv)
 {
-	llinfos << "Starting crash reporter." << llendl;
-
 	LLCrashLoggerMac app;
 	app.parseCommandOptions(argc, argv);
 
@@ -39,9 +40,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;
+    
 	return 0;
 }