summaryrefslogtreecommitdiff
path: root/indra/linux_crash_logger/llcrashloggerlinux.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2016-09-06 11:07:39 -0400
committerOz Linden <oz@lindenlab.com>2016-09-06 11:07:39 -0400
commit5edd4cecfc53b8287e1b3c6a22142bc72b8e0356 (patch)
treeb5bed4e1e4279b88ae882d93264dc2234ecb81e8 /indra/linux_crash_logger/llcrashloggerlinux.cpp
parent8c86c594be7b7898ac6e622c505181cf5b000da6 (diff)
parent1804da89eea38615a4dd9532757b7ef7c35d2be6 (diff)
merge changes for exception handling
Diffstat (limited to 'indra/linux_crash_logger/llcrashloggerlinux.cpp')
-rw-r--r--indra/linux_crash_logger/llcrashloggerlinux.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.cpp b/indra/linux_crash_logger/llcrashloggerlinux.cpp
index e2d2e7ff26..4092d43fc5 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -114,7 +114,7 @@ void LLCrashLoggerLinux::gatherPlatformSpecificFiles()
{
}
-bool LLCrashLoggerLinux::mainLoop()
+bool LLCrashLoggerLinux::frame()
{
bool send_logs = true;
if(CRASH_BEHAVIOR_ASK == getCrashBehavior())