From e1dffbcab5bda05dfa899aa024bec74da9b43a5c Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Wed, 20 Apr 2016 18:15:43 +0200
Subject: [PATCH] Re-apply Nicky's changes to the crashlogger

---
 indra/llcrashlogger/llcrashlogger.cpp | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
index 0d4579693e..11f9611dff 100644
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -629,6 +629,12 @@ bool LLCrashLogger::sendCrashLogs()
         rec["dumpdir"]=opts["dumpdir"];
         rec["procname"]=opts["procname"];
     }
+
+	// <FS:ND> Try to send the current crash right away, if that fails queue it for next time.
+	if( rec && rec.has("dumpdir") )
+		if( !sendCrashLog( rec["dumpdir"].asString() ) )
+			newlocks.append(rec);
+	// </FS:ND>
 	
     if (locks.isArray())
     {
@@ -667,10 +673,12 @@ bool LLCrashLogger::sendCrashLogs()
         }
     }
 
-    if (rec)
-    {
-        newlocks.append(rec);
-    }
+	// <FS:ND> We want this appended right away, or this crash only gets send the next time the crashreporter runs.
+    //if (rec)
+    //{
+    //    newlocks.append(rec);
+    //}
+	// </FS:ND>
     
     mKeyMaster.putProcessList(newlocks);
     return true;