summaryrefslogtreecommitdiff
path: root/indra/linux_crash_logger/llcrashloggerlinux.h
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/linux_crash_logger/llcrashloggerlinux.h
parent31d3d654f156351e3cf29f97fd97cbda046ae650 (diff)
parent1bbc523b048628630e0a45f67f15cdf39cb138d9 (diff)
Automated merge with file:///Users/nat/linden/viewer-comment-lllog
Diffstat (limited to 'indra/linux_crash_logger/llcrashloggerlinux.h')
-rw-r--r--indra/linux_crash_logger/llcrashloggerlinux.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/linux_crash_logger/llcrashloggerlinux.h b/indra/linux_crash_logger/llcrashloggerlinux.h
index dae6c46651..789f6f03f5 100644
--- a/indra/linux_crash_logger/llcrashloggerlinux.h
+++ b/indra/linux_crash_logger/llcrashloggerlinux.h
@@ -36,7 +36,7 @@ class LLCrashLoggerLinux : public LLCrashLogger
public:
LLCrashLoggerLinux(void);
~LLCrashLoggerLinux(void);
- virtual bool mainLoop();
+ virtual bool frame();
virtual void updateApplication(const std::string& = LLStringUtil::null);
virtual void gatherPlatformSpecificFiles();
virtual bool cleanup();