From 67ec47e6da389661934ed2ddfa55ca58455fa7e5 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 13 Nov 2012 17:10:10 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system moving fast timers
 into lltrace namespace and accumulation system

---
 indra/llcommon/lltrace.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'indra/llcommon/lltrace.cpp')

diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp
index 3f605f2c74..afb175c398 100644
--- a/indra/llcommon/lltrace.cpp
+++ b/indra/llcommon/lltrace.cpp
@@ -28,6 +28,7 @@
 #include "lltrace.h"
 #include "lltracerecording.h"
 #include "lltracethreadrecorder.h"
+#include "llfasttimer.h"
 
 namespace LLTrace
 {
@@ -37,13 +38,15 @@ static MasterThreadRecorder* gMasterThreadRecorder = NULL;
 void init()
 {
 	gMasterThreadRecorder = new MasterThreadRecorder();
+	Time::sCurTimerData = new Time::CurTimerData();
 }
 
 void cleanup()
 {
 	delete gMasterThreadRecorder;
-	LLUnitStrict<LLUnits::Seconds, F32> seconds;
 	gMasterThreadRecorder = NULL;
+	delete Time::sCurTimerData.get();
+	Time::sCurTimerData = NULL;
 }
 
 MasterThreadRecorder& getMasterThreadRecorder()
@@ -59,6 +62,4 @@ LLThreadLocalPointer<ThreadRecorder>& get_thread_recorder()
 
 }
 
-BlockTimer::Recorder::StackEntry BlockTimer::sCurRecorder;
-
 }
-- 
cgit v1.2.3