merge

1 files changed, 3 insertions, 7 deletions

diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index 7c5995a104..7b493a651e 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -43,16 +43,14 @@ ThreadRecorder::ThreadRecorder()
 	TimeBlock& root_time_block = TimeBlock::getRootTimeBlock();
 
 	ThreadTimerStack* timer_stack = ThreadTimerStack::getInstance();
+	timer_stack->mTimeBlock = &root_time_block;
+	timer_stack->mActiveTimer = NULL;
 
 	mNumTimeBlockTreeNodes = AccumulatorBuffer<TimeBlockAccumulator>::getDefaultBuffer()->size();
 	mTimeBlockTreeNodes = new TimeBlockTreeNode[mNumTimeBlockTreeNodes];
 
 	mThreadRecording.start();
 
-	timer_stack->mAccumulator = root_time_block.getPrimaryAccumulator();
-	timer_stack->mActiveTimer = NULL;
-
-
 	// initialize time block parent pointers
 	for (LLInstanceTracker<TimeBlock>::instance_iter it = LLInstanceTracker<TimeBlock>::beginInstances(), end_it = LLInstanceTracker<TimeBlock>::endInstances(); 
 		it != end_it; 
@@ -63,9 +61,7 @@ ThreadRecorder::ThreadRecorder()
 		tree_node.mBlock = &time_block;
 		tree_node.mParent = &root_time_block;
 
-		TimeBlockAccumulator* accumulator = it->getPrimaryAccumulator();
-		accumulator->mParent = &root_time_block;
-		accumulator->mBlock = &time_block;
+		it->getPrimaryAccumulator()->mParent = &root_time_block;
 	}
 
 	mRootTimer = new BlockTimer(root_time_block);