summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger/llcrashloggermac.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-10-11 10:59:17 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-10-11 10:59:17 -0400
commit704c53b3c506c1274981b3e1ca5a22c16e4fbbb4 (patch)
tree258785e6ebcd41009e6ef160a5d7b8e9ed218f94 /indra/mac_crash_logger/llcrashloggermac.cpp
parenteb8961235f7dcb03e3fe8ae2d02929d97cc5d7d7 (diff)
parent086c1342152895da28d2e0130d09432152604ca8 (diff)
MAINT-5232: Merge up to VLC viewer from viewer-release
Diffstat (limited to 'indra/mac_crash_logger/llcrashloggermac.cpp')
-rw-r--r--indra/mac_crash_logger/llcrashloggermac.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/mac_crash_logger/llcrashloggermac.cpp b/indra/mac_crash_logger/llcrashloggermac.cpp
index 3149fad6e8..ec3616e26a 100644
--- a/indra/mac_crash_logger/llcrashloggermac.cpp
+++ b/indra/mac_crash_logger/llcrashloggermac.cpp
@@ -64,7 +64,7 @@ void LLCrashLoggerMac::gatherPlatformSpecificFiles()
{
}
-bool LLCrashLoggerMac::mainLoop()
+bool LLCrashLoggerMac::frame()
{
if (mCrashBehavior == CRASH_BEHAVIOR_ALWAYS_SEND)