Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

You threw your arms around us, in the hopes we wouldn't change

Browse Source 
But we had to change some.
This commit is contained in:
Inusaito Sayori
2015-06-03 18:13:26 -04:00
parent 2d6a400967
commit e956b7da51
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llgesturemgr.cpp
View File

@@ -827,9 +827,17 @@ void LLGestureMgr::stepGesture(LLMultiGesture* gesture)
gest_it != gesture->mPlayingAnimIDs.end();
)
{
if (gesture->mLocal)
{
// Local, erase if no longer playing (or gone)
LLMotion* motion = gAgentAvatarp->findMotion(*gest_it);
if (!motion || motion->isStopped())
gesture->mPlayingAnimIDs.erase(gest_it);
++gest_it;
}
// look in signaled animations (simulator's view of what is
// currently playing.
if (gesture->mLocal ? !!gAgentAvatarp->findMotion(*gest_it) : (gAgentAvatarp->mSignaledAnimations.find(*gest_it) != gAgentAvatarp->mSignaledAnimations.end()))
else if (gAgentAvatarp->mSignaledAnimations.find(*gest_it) != gAgentAvatarp->mSignaledAnimations.end())
{
++gest_it;
}