summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-09-05 18:54:26 -0700
committerRichard Linden <none@none>2012-09-05 18:54:26 -0700
commit6814906fec95aeb90dbc99605f74f241a72af12b (patch)
treed517d15a3e73bcc31bb8ab499224e90a504c5dd0 /indra/llcommon/llfasttimer.cpp
parent62fcbb063a191fa4789145c3937e7bef6ce544bd (diff)
SH-3275 WIP Run viewer metrics for object update messages
build fix
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
-rw-r--r--indra/llcommon/llfasttimer.cpp26
1 files changed, 13 insertions, 13 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;
+//}