diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-09-20 09:54:49 -0400 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-09-20 09:54:49 -0400 |
| commit | 55e1557b8af1c02d6b50214f9f24d5a384aa3b3a (patch) | |
| tree | 069d6d7ae1c705d95aa0b4b7005977cf3fe7ab65 /indra/llcharacter/llcharacter.cpp | |
| parent | 28b43b783232eb54b01d1d918457b0865ddac093 (diff) | |
reapply 668dcacd6e76: MAINT-646 Vectorize LLPolyMesh
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 07f0baae51..0a6a8f9fa6 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -187,14 +187,20 @@ void LLCharacter::requestStopMotion( LLMotion* motion) //----------------------------------------------------------------------------- // updateMotions() //----------------------------------------------------------------------------- +static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation"); +static LLFastTimer::DeclareTimer FTM_UPDATE_HIDDEN_ANIMATION("Update Hidden Anim"); +static LLFastTimer::DeclareTimer FTM_UPDATE_MOTIONS("Update Motions"); + void LLCharacter::updateMotions(e_update_t update_type) { if (update_type == HIDDEN_UPDATE) { + LLFastTimer t(FTM_UPDATE_HIDDEN_ANIMATION); mMotionController.updateMotionsMinimal(); } else { + LLFastTimer t(FTM_UPDATE_ANIMATION); // unpause if the number of outstanding pause requests has dropped to the initial one if (mMotionController.isPaused() && mPauseRequest->getNumRefs() == 1) { @@ -202,6 +208,7 @@ void LLCharacter::updateMotions(e_update_t update_type) } bool force_update = (update_type == FORCE_UPDATE); { + LLFastTimer t(FTM_UPDATE_MOTIONS); mMotionController.updateMotions(force_update); } } |