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

FIRE-6155: Previewing an animation to upload while walking/sitting/flying results in the avatar getting stuck in that animation

Ansariel 2018-01-22 13:50:51 +01:00
parent 7f5e421a44
commit 9dd3f07e88
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloaterbvhpreview.cpp
View File

@ -491,16 +491,16 @@ BOOL LLFloaterBvhPreview::loadBVH()
void LLFloaterBvhPreview::unloadMotion()
{
if (mMotionID.notNull() && mAnimPreview && mUseOwnAvatar)
{
{
resetMotion();
// <FS> Preview on own avatar
//mAnimPreview->getDummyAvatar()->removeMotion(mMotionID);
mAnimPreview->getPreviewAvatar(this)->removeMotion(mMotionID);
// </FS>
LLKeyframeDataCache::removeKeyframeData(mMotionID);
LLKeyframeDataCache::removeKeyframeData(mMotionID);
}
mMotionID.setNull();
mMotionID.setNull();
mAnimPreview = NULL;
}
// </FS>
@ -510,19 +510,23 @@ void LLFloaterBvhPreview::unloadMotion()
//-----------------------------------------------------------------------------
LLFloaterBvhPreview::~LLFloaterBvhPreview()
{
// <FS> Reload animation from disk
//mAnimPreview = NULL;
unloadMotion();
// </FS>
mAnimPreview = NULL;
// <FS> Preview on own avatar
if (mUseOwnAvatar)
{
sOwnAvatarInstanceCount--;
if (mMotionID.notNull())
{
LLKeyframeDataCache::removeKeyframeData(mMotionID);
}
if (sOwnAvatarInstanceCount == 0 && isAgentAvatarValid())
{
gAgentAvatarp->deactivateAllMotions();
gAgentAvatarp->startDefaultMotions();
gAgentAvatarp->startMotion(ANIM_AGENT_STAND);
}
}
// </FS>