merge

1 files changed, 4 insertions, 2 deletions

diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp
index 7b493a651e..bc1d19e72c 100644
--- a/indra/llcommon/lltracethreadrecorder.cpp
+++ b/indra/llcommon/lltracethreadrecorder.cpp
@@ -43,7 +43,7 @@ ThreadRecorder::ThreadRecorder()
 	TimeBlock& root_time_block = TimeBlock::getRootTimeBlock();
 
 	ThreadTimerStack* timer_stack = ThreadTimerStack::getInstance();
-	timer_stack->mTimeBlock = &root_time_block;
+	timer_stack->mAccumulator = root_time_block.getPrimaryAccumulator();
 	timer_stack->mActiveTimer = NULL;
 
 	mNumTimeBlockTreeNodes = AccumulatorBuffer<TimeBlockAccumulator>::getDefaultBuffer()->size();
@@ -61,7 +61,9 @@ ThreadRecorder::ThreadRecorder()
 		tree_node.mBlock = &time_block;
 		tree_node.mParent = &root_time_block;
 
-		it->getPrimaryAccumulator()->mParent = &root_time_block;
+		TimeBlockAccumulator* accumulator = it->getPrimaryAccumulator();
+		accumulator->mParent = &root_time_block;
+		accumulator->mBlock = &time_block;
 	}
 
 	mRootTimer = new BlockTimer(root_time_block);