From 89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:44:50 -0500
Subject: Second Life viewer sources 1.14.0.0

---
 linden/indra/llcommon/llapp.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llcommon/llapp.cpp')

diff --git a/linden/indra/llcommon/llapp.cpp b/linden/indra/llcommon/llapp.cpp
index 42d9050..f48ff8f 100644
--- a/linden/indra/llcommon/llapp.cpp
+++ b/linden/indra/llcommon/llapp.cpp
@@ -30,9 +30,11 @@
 
 #include "llcommon.h"
 #include "llapr.h"
+#include "llerrorcontrol.h"
 #include "llerrorthread.h"
 #include "llframetimer.h"
 #include "llmemory.h"
+#include "lltimer.h"
 
 //
 // Signal handling
@@ -193,10 +195,8 @@ LLSD LLApp::getOptionData(OptionPriority level)
 
 void LLApp::stepFrame()
 {
-	// Update the static frame timer.
 	LLFrameTimer::updateFrameTime();
-
-	// Run ready runnables
+	LLEventTimer::updateClass();
 	mRunner.run();
 }
 
@@ -563,7 +563,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.
-- 
cgit v1.1