diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-10 18:31:39 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-10 18:31:39 -0800 |
| commit | abae31cb4a26500012663cdc2a06a290ac4e46c9 (patch) | |
| tree | ac14d3f485d7214fe6da2d0f9ef2daaa48b2d317 | |
| parent | 6961a1501f6381ac62cc3b6dee2eff47a5fbf0d6 (diff) | |
Provisional fix for EXT-2939
Restored the call to updateMotions(LLCharacter::HIDDEN_UPDATE) in LLVOAvatar::updateCharacter().
Added a specific fast timer for hidden updates in LLCharacter::updateMotions() to assess how much this will impact performance.
Reviewed by Richard.
| -rw-r--r-- | indra/llcharacter/llcharacter.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llvoavatar.cpp | 2 |
2 files changed, 4 insertions, 2 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) { diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index afe325856b..cf0808ea5b 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -3079,7 +3079,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent) if (!visible) { - //updateMotions(LLCharacter::HIDDEN_UPDATE); + updateMotions(LLCharacter::HIDDEN_UPDATE); return FALSE; } |