diff options
author | Richard Linden <none@none> | 2013-09-05 14:04:13 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-09-05 14:04:13 -0700 |
commit | cbe397ad13665c7bc993e10d8fe1e4a876253378 (patch) | |
tree | 52cd665a1138a65bd8ebfc94478c665ea40b2e25 /indra/llcharacter/llmotioncontroller.cpp | |
parent | 12688c8b549d2baa33509dca60bbe14b039b17db (diff) |
changed fast timer over to using macro
another attempt to move mem stat into base class
Diffstat (limited to 'indra/llcharacter/llmotioncontroller.cpp')
-rwxr-xr-x | indra/llcharacter/llmotioncontroller.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcharacter/llmotioncontroller.cpp b/indra/llcharacter/llmotioncontroller.cpp index b5065c348b..24fa1c86e9 100755 --- a/indra/llcharacter/llmotioncontroller.cpp +++ b/indra/llcharacter/llmotioncontroller.cpp @@ -541,7 +541,7 @@ void LLMotionController::updateIdleActiveMotions() //----------------------------------------------------------------------------- // updateMotionsByType() //----------------------------------------------------------------------------- -static LLFastTimer::DeclareTimer FTM_MOTION_ON_UPDATE("Motion onUpdate"); +static LLTrace::TimeBlock FTM_MOTION_ON_UPDATE("Motion onUpdate"); void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_type) { @@ -701,7 +701,7 @@ void LLMotionController::updateMotionsByType(LLMotion::LLMotionBlendType anim_ty // perform motion update { - LLFastTimer t(FTM_MOTION_ON_UPDATE); + LL_RECORD_BLOCK_TIME(FTM_MOTION_ON_UPDATE); update_result = motionp->onUpdate(mAnimTime - motionp->mActivationTimestamp, last_joint_signature); } } |