diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-09-10 10:37:02 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-09-10 10:37:02 -0700 |
| commit | a766e26db46c7c054bae1021470dbe365f2a3cb3 (patch) | |
| tree | 93ffd22d902bef8d44e81b6989dcb2966beba2fc /indra/llcharacter/llcharacter.cpp | |
| parent | dab915c1d2a2d08363944de8ac4362fbe162bea0 (diff) | |
Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository.
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 0a6a8f9fa6..c9fb8534f1 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -189,7 +189,6 @@ void LLCharacter::requestStopMotion( LLMotion* motion) //----------------------------------------------------------------------------- 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) { @@ -207,10 +206,7 @@ void LLCharacter::updateMotions(e_update_t update_type) mMotionController.unpauseAllMotions(); } bool force_update = (update_type == FORCE_UPDATE); - { - LLFastTimer t(FTM_UPDATE_MOTIONS); - mMotionController.updateMotions(force_update); - } + mMotionController.updateMotions(force_update); } } |