diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-07-13 10:44:40 -0400 |
| commit | cd1c64d68986a9d6ce2f41cd00a720681b738013 (patch) | |
| tree | d064cccb72bdc03b888075d06a30b2ab3d244442 /indra/mac_crash_logger/llcrashloggermac.cpp | |
| parent | f868e29945806fd6cefde65067ae2c870ac112a6 (diff) | |
| parent | b031b1a6255af0813698bd40586f30f7b0a76f58 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/mac_crash_logger/llcrashloggermac.cpp')
| -rw-r--r-- | indra/mac_crash_logger/llcrashloggermac.cpp | 2 |
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) |