From adeeabfc13c91dc99a1ea1949cd2f820c4150995 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Mon, 24 Sep 2012 18:56:01 -0700
Subject: SH-3275 WIP Run viewer metrics for object update messages moved
 LLThreadLocalPtr to llapr fixed various startup race conditions for
 LLThreadLocalPtr

---
 indra/llcommon/lltrace.cpp | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

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

diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp
index 037c52f8c1..501414ebf3 100644
--- a/indra/llcommon/lltrace.cpp
+++ b/indra/llcommon/lltrace.cpp
@@ -32,7 +32,21 @@ namespace LLTrace
 {
 
 BlockTimer::Recorder::StackEntry BlockTimer::sCurRecorder;
-LLThreadLocalPtr<ThreadTraceData> ThreadTraceData::sCurThreadTrace;
+
+MasterThreadTrace *gMasterThreadTrace = NULL;
+LLThreadLocalPtr<ThreadTraceData> gCurThreadTrace;
+
+void init()
+{
+	gMasterThreadTrace = new MasterThreadTrace();
+	gCurThreadTrace = gMasterThreadTrace;
+}
+
+void cleanup()
+{
+	delete gMasterThreadTrace;
+}
+
 
 ///////////////////////////////////////////////////////////////////////
 // Sampler
-- 
cgit v1.2.3