From 6db6cb39f41e921e75970d1570a74cf35d353a35 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Fri, 16 Nov 2012 23:02:53 -0800
Subject: SH-3406 WIP convert fast timers to lltrace system got new fast timer
 code to compile and run

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

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

diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp
index 9bf9ae6c8e..e11e39a1a2 100644
--- a/indra/llcommon/lltrace.cpp
+++ b/indra/llcommon/lltrace.cpp
@@ -30,6 +30,8 @@
 #include "lltracethreadrecorder.h"
 #include "llfasttimer.h"
 
+static bool sInitialized;
+
 namespace LLTrace
 {
 
@@ -38,15 +40,18 @@ static MasterThreadRecorder* gMasterThreadRecorder = NULL;
 void init()
 {
 	gMasterThreadRecorder = new MasterThreadRecorder();
-	BlockTimer::sCurTimerData = new CurTimerData();
+	sInitialized = true;
+}
+
+bool isInitialized()
+{
+	return sInitialized; 
 }
 
 void cleanup()
 {
 	delete gMasterThreadRecorder;
 	gMasterThreadRecorder = NULL;
-	delete BlockTimer::sCurTimerData.get();
-	BlockTimer::sCurTimerData = NULL;
 }
 
 MasterThreadRecorder& getMasterThreadRecorder()
@@ -62,3 +67,4 @@ LLThreadLocalPointer<ThreadRecorder>& get_thread_recorder()
 }
 
 }
+
-- 
cgit v1.2.3