diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-08-29 17:06:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-08-29 17:06:12 -0400 |
| commit | 6b24122857583537495a01f408c6c303f93adb02 (patch) | |
| tree | 382a25e202c5fd171dcb01fb3e82bbb12781540e /indra/linux_crash_logger/llcrashloggerlinux.cpp | |
| parent | 3d9c39c77cd4e4e8da8abf9234f1c751762985e6 (diff) | |
| parent | 20cf275d21c0dce569bb3a16393b529c5c9f1c6c (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-vlc
Diffstat (limited to 'indra/linux_crash_logger/llcrashloggerlinux.cpp')
| -rw-r--r-- | indra/linux_crash_logger/llcrashloggerlinux.cpp | 2 |
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()) |