diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-11-19 11:09:58 -0500 |
| commit | b7f8a2479249646c7fb38ead195d5197ab733c94 (patch) | |
| tree | c1bf4a2b0ecac69a4705827a042ea7f0224ebc54 /indra/llcharacter/llcharacter.cpp | |
| parent | c94756d92c7353cb91bfddb5e342f825457e1a7e (diff) | |
| parent | f8749ec9bd03072cc5b50f4cb1a61289b2989c72 (diff) | |
merge up to 3.4.1-release
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index c9fb8534f1..0a6a8f9fa6 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -189,6 +189,7 @@ 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) { @@ -206,7 +207,10 @@ void LLCharacter::updateMotions(e_update_t update_type) mMotionController.unpauseAllMotions(); } bool force_update = (update_type == FORCE_UPDATE); - mMotionController.updateMotions(force_update); + { + LLFastTimer t(FTM_UPDATE_MOTIONS); + mMotionController.updateMotions(force_update); + } } } |