diff options
| author | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2010-02-11 22:29:43 +0800 |
| commit | 01561ea13ab5741aee70b8873d81078bafb55b86 (patch) | |
| tree | 2c1267e05ccab296525ad1dea469a60560c37a30 /indra/llcharacter/llcharacter.cpp | |
| parent | e747e9a3da3166de88dea1af213a36694135b820 (diff) | |
| parent | 69bed1f123f35b6124f4e3255df156b7fe82418b (diff) | |
merge from remote repo
Diffstat (limited to 'indra/llcharacter/llcharacter.cpp')
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llcharacter/llcharacter.cpp b/indra/llcharacter/llcharacter.cpp index 528a7bb4a5..40a9752268 100644 --- a/indra/llcharacter/llcharacter.cpp +++ b/indra/llcharacter/llcharacter.cpp @@ -181,16 +181,18 @@ void LLCharacter::requestStopMotion( LLMotion* motion) // updateMotions() //----------------------------------------------------------------------------- static LLFastTimer::DeclareTimer FTM_UPDATE_ANIMATION("Update Animation"); +static LLFastTimer::DeclareTimer FTM_UPDATE_HIDDEN_ANIMATION("Update Hidden Anim"); void LLCharacter::updateMotions(e_update_t update_type) { - LLFastTimer t(FTM_UPDATE_ANIMATION); 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) { |