diff options
| author | Mark Lentczner <markl@lindenlab.com> | 2007-02-06 00:57:33 +0000 |
|---|---|---|
| committer | Mark Lentczner <markl@lindenlab.com> | 2007-02-06 00:57:33 +0000 |
| commit | d0d4670f4941dcf7430fb1269c6613140ecf3ff7 (patch) | |
| tree | e3d6b59c19cac6bc172ec5fb0131ffc8f4923b75 /indra/llcommon/llapp.cpp | |
| parent | 77f04c74eb1603bf2fadc30127d05378bfc7a48a (diff) | |
merge in of error-refactor-3
concludes (fixes) SL-31187
pair programmed and reviewed by markl and karen
Diffstat (limited to 'indra/llcommon/llapp.cpp')
| -rw-r--r-- | indra/llcommon/llapp.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index 87e7016f39..fe5587365c 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -11,9 +11,11 @@ #include "llcommon.h" #include "llapr.h" +#include "llerrorcontrol.h" #include "llerrorthread.h" #include "llframetimer.h" #include "llmemory.h" +#include "lltimer.h" // // Signal handling @@ -174,10 +176,8 @@ LLSD LLApp::getOptionData(OptionPriority level) void LLApp::stepFrame() { - // Update the static frame timer. LLFrameTimer::updateFrameTime(); - - // Run ready runnables + LLEventTimer::updateClass(); mRunner.run(); } @@ -544,7 +544,7 @@ void default_unix_signal_handler(int signum, siginfo_t *info, void *) else { // Don't log anything, even errors - this is because this signal could happen anywhere. - gErrorStream.setLevel(LLErrorStream::NONE); + LLError::setDefaultLevel(LLError::LEVEL_NONE); } // Change the signal that we reraise to SIGABRT, so we generate a core dump. |