summaryrefslogtreecommitdiff
path: root/indra/mac_crash_logger/llcrashloggermac.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-09-01 15:22:34 -0400
committerNat Goodspeed <nat@lindenlab.com>2016-09-01 15:22:34 -0400
commit7203162071163108cbbb18f90ddb7f5d6734f8bd (patch)
tree698966629d29e71f77777c75331aeac272e0371a /indra/mac_crash_logger/llcrashloggermac.cpp
parent31d3d654f156351e3cf29f97fd97cbda046ae650 (diff)
parent1bbc523b048628630e0a45f67f15cdf39cb138d9 (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
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)