diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 19:44:38 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2016-09-01 19:44:38 -0400 |
commit | 96467f09f2ef9eba9c8e1d721349d9cc8f3e1bbb (patch) | |
tree | 97528c1d3129feaa152aa6c8d589b4ca9e8005f9 /indra/linux_crash_logger/llcrashloggerlinux.cpp | |
parent | 9be4e7e448769cb82dc7d82e93bee4f1cd2b3e6c (diff) | |
parent | 7203162071163108cbbb18f90ddb7f5d6734f8bd (diff) |
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
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()) |