3 files changed, 9 insertions, 15 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index ea4e1a89a2..a144a8c94e 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -270,7 +270,6 @@ void TimeBlock::processTimes()
 		stack_record->mChildTime += cumulative_time_delta;
 	}
 
-
 	// reset for next frame
 	for (LLInstanceTracker<TimeBlock>::instance_iter it = LLInstanceTracker<TimeBlock>::beginInstances(),
 			end_it = LLInstanceTracker<TimeBlock>::endInstances();
@@ -283,20 +282,6 @@ void TimeBlock::processTimes()
 		accumulator->mLastCaller = NULL;
 		accumulator->mMoveUpTree = false;
 	}
-
-	// traverse tree in DFS post order, or bottom up
-	//for(timer_tree_bottom_up_iterator_t it = begin_timer_tree_bottom_up(TimeBlock::getRootTimer());
-	//	it != end_timer_tree_bottom_up();
-	//	++it)
-	//{
-	//	TimeBlock* timerp = (*it);
-	//	TimeBlockAccumulator& accumulator = timerp->getPrimaryAccumulator();
-	//	timerp->mTreeTimeCounter = accumulator.mSelfTimeCounter;
-	//	for (child_const_iter child_it = timerp->beginChildren(); child_it != timerp->endChildren(); ++child_it)
-	//	{
-	//		timerp->mTreeTimeCounter += (*child_it)->mTreeTimeCounter;
-	//	}
-	//}
 }
 
 
diff --git a/indra/llcommon/lltracerecording.cpp b/indra/llcommon/lltracerecording.cpp
index f45226eb9a..913c4cbdad 100644
--- a/indra/llcommon/lltracerecording.cpp
+++ b/indra/llcommon/lltracerecording.cpp
@@ -470,43 +470,51 @@ void ExtendableRecording::extend()
 
 void ExtendableRecording::start()
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::start();
 	mPotentialRecording.start();
 }
 
 void ExtendableRecording::stop()
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::stop();
 	mPotentialRecording.stop();
 }
 
 void ExtendableRecording::pause()
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::pause();
 	mPotentialRecording.pause();
 }
 
 void ExtendableRecording::resume()
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::resume();
 	mPotentialRecording.resume();
 }
 
 void ExtendableRecording::restart()
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::restart();
 	mAcceptedRecording.reset();
 	mPotentialRecording.restart();
 }
 
 void ExtendableRecording::reset()
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::reset();
 	mAcceptedRecording.reset();
 	mPotentialRecording.reset();
 }
 
 void ExtendableRecording::splitTo(ExtendableRecording& other)
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::splitTo(other);
 	mPotentialRecording.splitTo(other.mPotentialRecording);
 }
 
 void ExtendableRecording::splitFrom(ExtendableRecording& other)
 {
+	LLStopWatchControlsMixin<ExtendableRecording>::splitFrom(other);
 	mPotentialRecording.splitFrom(other.mPotentialRecording);
 }
 
diff --git a/indra/llcommon/lltracerecording.h b/indra/llcommon/lltracerecording.h
index a773c9ad91..05e1577a5a 100644
--- a/indra/llcommon/lltracerecording.h
+++ b/indra/llcommon/lltracerecording.h
@@ -391,6 +391,7 @@ namespace LLTrace
 	{
 	public:
 		void extend();
+		Recording& getAcceptedRecording() { return mAcceptedRecording; }
 
 		// implementation for LLStopWatchControlsMixin
 		/*virtual*/ void start();