summaryrefslogtreecommitdiff
path: root/indra/linux_crash_logger
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-28 16:51:33 -0400
committerOz Linden <oz@lindenlab.com>2011-10-28 16:51:33 -0400
commit5e2bbdfc2ede7b9008328f63e2824d2912a82c7e (patch)
tree5dfd62c7e9039f159517646bfdb00552fede6d8f /indra/linux_crash_logger
parent53f7c7153e54cbe5179a6c5f14afbbdaf8a5edf1 (diff)
parent5c868a90f2e30245771aa1ef402645d6d3f12ab1 (diff)
merge changes for storm-1671
Diffstat (limited to 'indra/linux_crash_logger')
-rwxr-xr-x[-rw-r--r--]indra/linux_crash_logger/llcrashloggerlinux.cpp6
-rwxr-xr-x[-rw-r--r--]indra/linux_crash_logger/llcrashloggerlinux.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 7316717193..62465f9937 100644..100755
--- 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
index 65d5e4e653..dae6c46651 100644..100755
--- 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