diff options
| author | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-09-05 14:21:57 -0700 |
| commit | 9dc6478544711b1f03c9f7010421f9c8ebbbe008 (patch) | |
| tree | 1d28248570ac6e48596c787734bc39a891d9752e /indra/llcharacter/llmotioncontroller.cpp | |
| parent | 736efc7b574635d5c86a97a33b456dd79a035777 (diff) | |
| parent | cbe397ad13665c7bc993e10d8fe1e4a876253378 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
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); } } |