1 files changed, 15 insertions, 1 deletions
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