From 0c84957d312bc3dc31fdb5711317157df73b72e6 Mon Sep 17 00:00:00 2001
From: "Brad Payne (Vir Linden)" <vir@lindenlab.com>
Date: Thu, 27 Oct 2011 14:50:54 -0400
Subject: SH-2606 FIX, SH-2628 FIX - crash on exit in crash logger fixed by
 LLProxy::cleanupClass()

---
 indra/llcrashlogger/llcrashlogger.cpp | 7 +++++++
 indra/llcrashlogger/llcrashlogger.h   | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 indra/llcrashlogger/llcrashlogger.cpp
 mode change 100644 => 100755 indra/llcrashlogger/llcrashlogger.h

(limited to 'indra/llcrashlogger')

diff --git a/indra/llcrashlogger/llcrashlogger.cpp b/indra/llcrashlogger/llcrashlogger.cpp
old mode 100644
new mode 100755
index 331a1692ee..3461aa3e6c
--- a/indra/llcrashlogger/llcrashlogger.cpp
+++ b/indra/llcrashlogger/llcrashlogger.cpp
@@ -42,6 +42,7 @@
 #include "llpumpio.h"
 #include "llhttpclient.h"
 #include "llsdserialize.h"
+#include "llproxy.h"
 
 LLPumpIO* gServicePump;
 BOOL gBreak = false;
@@ -428,3 +429,9 @@ bool LLCrashLogger::init()
 	
 	return true;
 }
+
+// For cleanup code common to all platforms.
+void LLCrashLogger::commonCleanup()
+{
+	LLProxy::cleanupClass();
+}
diff --git a/indra/llcrashlogger/llcrashlogger.h b/indra/llcrashlogger/llcrashlogger.h
old mode 100644
new mode 100755
index 5d0cb5931c..1510d7e0b3
--- a/indra/llcrashlogger/llcrashlogger.h
+++ b/indra/llcrashlogger/llcrashlogger.h
@@ -48,7 +48,8 @@ public:
 	virtual void updateApplication(const std::string& message = LLStringUtil::null);
 	virtual bool init();
 	virtual bool mainLoop() = 0;
-	virtual bool cleanup() { return true; }
+	virtual bool cleanup() = 0;
+	void commonCleanup();
 	void setUserText(const std::string& text) { mCrashInfo["UserNotes"] = text; }
 	S32 getCrashBehavior() { return mCrashBehavior; }
 	bool runCrashLogPost(std::string host, LLSD data, std::string msg, int retries, int timeout);
-- 
cgit v1.2.3