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

Proposed fix for FIRE-4730

ziree 2012-07-14 00:35:46 +02:00
parent 4699094018
commit 900a2ef3ef
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
indra/newview/aoengine.cpp
View File

@ -330,20 +330,24 @@ const LLUUID AOEngine::override(const LLUUID& pMotion,BOOL start)
if(!state)
{
lldebugs << "No current AO state for motion " << motion << " (" << gAnimLibrary.animationName(motion) << ")." << llendl;
if(!gAnimLibrary.animStateToString(motion) && !start)
{
state=mCurrentSet->getStateByRemapID(mLastOverriddenMotion);
if(state && state->mCurrentAnimationID==motion)
{
lldebugs << "Stop requested for current overridden animation UUID " << motion << " - Skipping." << llendl;
}
else
{
lldebugs << "Stop requested for unknown UUID " << motion << " - Stopping it just in case." << llendl;
gAgent.sendAnimationRequest(motion,ANIM_REQUEST_STOP);
gAgentAvatarp->LLCharacter::stopMotion(motion);
}
}
// This part of the code was added to capture an edge case where animations got stuck
// However, it seems it isn't needed anymore and breaks other, more important cases.
// So we disable this code for now, unless bad things happen and the stuck animations
// come back again. -Zi
// if(!gAnimLibrary.animStateToString(motion) && !start)
// {
// state=mCurrentSet->getStateByRemapID(mLastOverriddenMotion);
// if(state && state->mCurrentAnimationID==motion)
// {
// lldebugs << "Stop requested for current overridden animation UUID " << motion << " - Skipping." << llendl;
// }
// else
// {
// lldebugs << "Stop requested for unknown UUID " << motion << " - Stopping it just in case." << llendl;
// gAgent.sendAnimationRequest(motion,ANIM_REQUEST_STOP);
// gAgentAvatarp->LLCharacter::stopMotion(motion);
// }
// }
return animation;
}