3 files changed, 23 insertions, 23 deletions

diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp
index 939e332c3b..0abaf73063 100644
--- a/indra/llcommon/llfasttimer.cpp
+++ b/indra/llcommon/llfasttimer.cpp
@@ -388,8 +388,8 @@ void LLFastTimer::NamedTimer::accumulateTimings()
 		U32 cumulative_time_delta = cur_time - cur_timer->mStartTime;
 		U32 self_time_delta = cumulative_time_delta - cur_data->mChildTime;
 		cur_data->mChildTime = 0;
-		cur_timer->mFrameState->mSelfTimeCounter += self_time_delta;
-		cur_timer->mFrameState->mTotalTimeCounter += cumulative_time_delta;
+		cur_data->mFrameState->mSelfTimeCounter += self_time_delta;
+		cur_data->mFrameState->mTotalTimeCounter += cumulative_time_delta;
 
 		cur_timer->mStartTime = cur_time;
 
@@ -643,16 +643,16 @@ const LLFastTimer::NamedTimer* LLFastTimer::getTimerByName(const std::string& na
 	return NamedTimerFactory::instance().getTimerByName(name);
 }
 
-LLFastTimer::LLFastTimer(LLFastTimer::FrameState* state)
-:	mFrameState(state)
-{
-	U32 start_time = getCPUClockCount32();
-	mStartTime = start_time;
-	mFrameState->mActiveCount++;
-	LLFastTimer::sCurTimerData.mCurTimer = this;
-	LLFastTimer::sCurTimerData.mFrameState = mFrameState;
-	LLFastTimer::sCurTimerData.mChildTime = 0;
-	mLastTimerData = LLFastTimer::sCurTimerData;
-}
+//LLFastTimer::LLFastTimer(LLFastTimer::FrameState* state)
+//:	mFrameState(state)
+//{
+//	U32 start_time = getCPUClockCount32();
+//	mStartTime = start_time;
+//	mFrameState->mActiveCount++;
+//	LLFastTimer::sCurTimerData.mCurTimer = this;
+//	LLFastTimer::sCurTimerData.mFrameState = mFrameState;
+//	LLFastTimer::sCurTimerData.mChildTime = 0;
+//	mLastTimerData = LLFastTimer::sCurTimerData;
+//}
 
 
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 061a37ae31..4660fad5e3 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -45,10 +45,12 @@ LL_COMMON_API void assert_main_thread();
 class LL_COMMON_API LLFastTimer
 {
 public:
+	class NamedTimer;
+
 	struct LL_COMMON_API FrameState
 	{
 		FrameState();
-		void setNamedTimer(NamedTimer* timerp) { mTimer = timerp; }
+		void setNamedTimer(class NamedTimer* timerp) { mTimer = timerp; }
 
 		U32 				mSelfTimeCounter;
 		U32 				mTotalTimeCounter;
@@ -152,13 +154,12 @@ public:
 	};
 
 public:
-	LLFastTimer(LLFastTimer::FrameState* state);
+	//LLFastTimer(LLFastTimer::FrameState* state);
 
 	LL_FORCE_INLINE LLFastTimer(LLFastTimer::DeclareTimer& timer)
-	:	mFrameState(&timer.mFrameState)
 	{
 #if FAST_TIMER_ON
-		LLFastTimer::FrameState* frame_state = mFrameState;
+		LLFastTimer::FrameState* frame_state = &timer.mFrameState;
 		mStartTime = getCPUClockCount32();
 
 		frame_state->mActiveCount++;
@@ -182,7 +183,7 @@ public:
 	LL_FORCE_INLINE ~LLFastTimer()
 	{
 #if FAST_TIMER_ON
-		LLFastTimer::FrameState* frame_state = mFrameState;
+		LLFastTimer::FrameState* frame_state = LLFastTimer::sCurTimerData.mFrameState;
 		U32 total_time = getCPUClockCount32() - mStartTime;
 
 		frame_state->mSelfTimeCounter += total_time - LLFastTimer::sCurTimerData.mChildTime;
@@ -380,7 +381,6 @@ private:
 	static U64				sLastFrameTime;
 
 	U32							mStartTime;
-	LLFastTimer::FrameState*	mFrameState;
 	LLFastTimer::CurTimerData	mLastTimerData;
 
 };
diff --git a/indra/llcommon/lltrace.h b/indra/llcommon/lltrace.h
index 3d3ee18100..6323091cb8 100644
--- a/indra/llcommon/lltrace.h
+++ b/indra/llcommon/lltrace.h
@@ -81,16 +81,16 @@ namespace LLTrace
 				accumulator->mMoveUpTree |= (accumulator->mParent->mActiveCount == 0);
 
 				// push new timer on stack
-				sRecorderHead->mRecorder = this;
-				sRecorderHead->mAccumulator = accumulator;
-				sRecorderHead->mChildTime = 0;
+				sRecorderHead.mRecorder = this;
+				sRecorderHead.mAccumulator = accumulator;
+				sRecorderHead.mChildTime = 0;
 			}
 
 			LL_FORCE_INLINE ~Recorder()
 			{
 				U32 total_time = getCPUClockCount32() - mStartTime;
 
-				Accumulator* accumulator = sRecorderHead->mAccumulator;
+				Accumulator* accumulator = sRecorderHead.mAccumulator;
 				accumulator->mSelfTimeCounter += total_time- sRecorderHead.mChildTime;
 				accumulator->mTotalTimeCounter += total_time;
 				accumulator->mActiveCount--;