livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Monroe Linden 2010-02-10 18:31:39 -08:00
parent 6961a1501f
commit abae31cb4a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llcharacter/llcharacter.cpp
View File

@ -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)
{

2
indra/newview/llvoavatar.cpp
View File

@ -3079,7 +3079,7 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
if (!visible)
{
//updateMotions(LLCharacter::HIDDEN_UPDATE);
updateMotions(LLCharacter::HIDDEN_UPDATE);
return FALSE;
}