diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-09-20 09:48:55 -0400 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-09-20 09:48:55 -0400 |
| commit | cf98064700a736f73a6c21ce899b186919cbeb64 (patch) | |
| tree | 30f222c22fe07c2a04c047a27e542b53075507e9 /indra/llcharacter/llcharacter.cpp | |
| parent | f80d16808d21eaa9a3e8550284d25a43e2669ae2 (diff) | |
reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 0a6a8f9fa6..07f0baae51 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -187,20 +187,14 @@ 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) { @@ -208,7 +202,6 @@ void LLCharacter::updateMotions(e_update_t update_type) } bool force_update = (update_type == FORCE_UPDATE); { - LLFastTimer t(FTM_UPDATE_MOTIONS); mMotionController.updateMotions(force_update); } } |