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

Smart AO got confused with animations running from attachments or objects other than the seat. Fixes FIRE-3896

master
ziree 2012-01-12 15:58:11 +01:00
parent 36225fb9e0
commit 55ee628490
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
indra/newview/aoengine.cpp
View File

@ -137,13 +137,16 @@ void AOEngine::setLastOverriddenMotion(const LLUUID& motion)
mLastOverriddenMotion=motion;
}
BOOL AOEngine::foreignAnimations()
BOOL AOEngine::foreignAnimations(const LLUUID& seat)
{
for(LLVOAvatar::AnimSourceIterator sourceIterator=gAgentAvatarp->mAnimationSources.begin();
sourceIterator!=gAgentAvatarp->mAnimationSources.end();sourceIterator++)
{
if(sourceIterator->first!=gAgent.getID())
return TRUE;
{
if(seat.isNull() || sourceIterator->first==seat)
return TRUE;
}
}
return FALSE;
}
@ -260,7 +263,7 @@ void AOEngine::enable(BOOL yes)
lldebugs << "state "<< index <<" returned NULL." << llendl;
}
if(!foreignAnimations())
if(!foreignAnimations(LLUUID::null))
gAgent.sendAnimationRequest(mLastMotion,ANIM_REQUEST_START);
mCurrentSet->stopTimer();
@ -466,7 +469,13 @@ const LLUUID AOEngine::override(const LLUUID& pMotion,BOOL start)
void AOEngine::checkSitCancel()
{
if(foreignAnimations())
LLUUID seat;
const LLViewerObject* agentRoot=dynamic_cast<LLViewerObject*>(gAgentAvatarp->getRoot());
if(agentRoot)
seat=agentRoot->getID();
if(foreignAnimations(seat))
{
LLUUID animation=mCurrentSet->getStateByRemapID(ANIM_AGENT_SIT)->mCurrentAnimationID;
if(animation.notNull())

2
indra/newview/aoengine.h
View File

@ -160,7 +160,7 @@ class AOEngine
void stopAllStandVariants();
void stopAllSitVariants();
BOOL foreignAnimations();
BOOL foreignAnimations(const LLUUID& seat);
const LLUUID& mapSwimming(const LLUUID& motion) const;
void updateSortOrder(AOSet::AOState* state);