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/linux_crash_logger/llcrashloggerlinux.cpp | 6 ++++++
 indra/linux_crash_logger/llcrashloggerlinux.h   | 1 +
 2 files changed, 7 insertions(+)
 mode change 100644 => 100755 indra/linux_crash_logger/llcrashloggerlinux.cpp
 mode change 100644 => 100755 indra/linux_crash_logger/llcrashloggerlinux.h

(limited to 'indra/linux_crash_logger')

diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
old mode 100644
new mode 100755
index 7316717193..62465f9937
--- a/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -133,6 +133,12 @@ bool LLCrashLoggerLinux::mainLoop()
 	return true;
 }
 
+bool LLCrashLoggerLinux::cleanup()
+{
+	commonCleanup();
+	return true;
+}
+
 void LLCrashLoggerLinux::updateApplication(const std::string& message)
 {
 	LLCrashLogger::updateApplication(message);
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h
old mode 100644
new mode 100755
index 65d5e4e653..dae6c46651
--- a/indra/linux_crash_logger/llcrashloggerlinux.h
+++ b/indra/linux_crash_logger/llcrashloggerlinux.h
@@ -39,6 +39,7 @@ public:
 	virtual bool mainLoop();
 	virtual void updateApplication(const std::string& = LLStringUtil::null);
 	virtual void gatherPlatformSpecificFiles();
+	virtual bool cleanup();
 };
 
 #endif
-- 
cgit v1.2.3