SH-3406 WIP convert fast timers to lltrace system

got new fast timer code to compile and run

1 files changed, 12 insertions, 1 deletions

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 4ecca12832..e1549b4bff 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -336,7 +336,10 @@ void BlockTimer::accumulateTimings()
 
 		cur_data = &cur_timer->mLastTimerData;
 		cur_data->mChildTime += cumulative_time_delta;
-		accumulator = cur_data->mTimerData->getPrimaryAccumulator();
+		if (cur_data->mTimerData)
+		{
+			accumulator = cur_data->mTimerData->getPrimaryAccumulator();
+		}
 
 		cur_timer = cur_timer->mLastTimerData.mCurTimer;
 	}
@@ -572,6 +575,14 @@ void Time::writeLog(std::ostream& os)
 }
 
 
+LLTrace::TimerAccumulator::TimerAccumulator() :	mSelfTimeCounter(0),
+	mTotalTimeCounter(0),
+	mCalls(0),
+	mLastCaller(NULL),
+	mActiveCount(0),
+	mMoveUpTree(false)
+{}
+
 void LLTrace::TimerAccumulator::addSamples( const LLTrace::TimerAccumulator& other )
 {
 	mSelfTimeCounter += other.mSelfTimeCounter;