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

Cleaned up code a bit, fixed issue with referencing effectp instead of avatar

meow-7.2.2
Kyler Eastridge 2024-04-16 13:47:09 -04:00 committed by Andrey Kleshchev
parent 180a2aaacb
commit 7723da1398
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llhudeffectresetskeleton.cpp
View File

@ -196,7 +196,7 @@ void LLHUDEffectResetSkeleton::update()
// Only the owner of a avatar can reset their skeleton like this
if (mSourceObject->getID() == mTargetObject->getID())
{
LLVOAvatar* avatar = (LLVOAvatar*)(LLViewerObject*)mTargetObject;
LLVOAvatar* avatar = mTargetObject->asAvatar();
avatar->resetSkeleton(mResetAnimations);
}
}

14
indra/newview/llviewermenu.cpp
View File

@ -6506,16 +6506,16 @@ class LLAvatarResetSkeleton: public view_listener_t
}
if(avatar)
{
if(avatar->getID() == gAgent.getID())
if(avatar->getID() == gAgentID)
{
LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, owned);
LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
effectp->setSourceObject(gAgentAvatarp);
effectp->setTargetObject((LLViewerObject*)avatar);
effectp->setResetAnimations(false);
}
else
{
effectp->setResetAnimations(false);
avatar->setResetAnimations(false);
}
}
return true;
@ -6543,7 +6543,7 @@ class LLAvatarResetSkeletonAndAnimations : public view_listener_t
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (avatar)
{
if(avatar->getID() == gAgent.getID())
if(avatar->getID() == gAgentID)
{
LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
effectp->setSourceObject(gAgentAvatarp);
@ -6552,7 +6552,7 @@ class LLAvatarResetSkeletonAndAnimations : public view_listener_t
}
else
{
effectp->setResetAnimations(true);
avatar->setResetAnimations(true);
}
}
return true;
@ -6566,7 +6566,7 @@ class LLAvatarResetSelfSkeletonAndAnimations : public view_listener_t
LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());
if (avatar)
{
if(avatar->getID() == gAgent.getID())
if(avatar->getID() == gAgentID)
{
LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);
effectp->setSourceObject(gAgentAvatarp);
@ -6575,7 +6575,7 @@ class LLAvatarResetSelfSkeletonAndAnimations : public view_listener_t
}
else
{
effectp->setResetAnimations(true);
avatar->setResetAnimations(true);
}
}
else