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

FelixWolf · akleshchev · commit 7723da1398ab · 2024-04-16T22:26:30.000+03:00
diff --git a/indra/newview/llhudeffectresetskeleton.cpp b/indra/newview/llhudeffectresetskeleton.cpp
@@ -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);
 		}
 	}
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ void LLHUDEffectResetSkeleton::update()`
`196`	`196`	`// Only the owner of a avatar can reset their skeleton like this`
`197`	`197`	`if (mSourceObject->getID() == mTargetObject->getID())`
`198`	`198`	`{`
`199`		`- LLVOAvatar* avatar = (LLVOAvatar)(LLViewerObject)mTargetObject;`
	`199`	`+ LLVOAvatar* avatar = mTargetObject->asAvatar();`
`200`	`200`	`avatar->resetSkeleton(mResetAnimations);`
`201`	`201`	`}`
`202`	`202`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6506,16 +6506,16 @@ class LLAvatarResetSkeleton: public view_listener_t`
`6506`	`6506`	`}`
`6507`	`6507`	`if(avatar)`
`6508`	`6508`	`{`
`6509`		`- if(avatar->getID() == gAgent.getID())`
	`6509`	`+ if(avatar->getID() == gAgentID)`
`6510`	`6510`	`{`
`6511`		`- LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, owned);`
	`6511`	`+ LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);`
`6512`	`6512`	`effectp->setSourceObject(gAgentAvatarp);`
`6513`	`6513`	`effectp->setTargetObject((LLViewerObject*)avatar);`
`6514`	`6514`	`effectp->setResetAnimations(false);`
`6515`	`6515`	`}`
`6516`	`6516`	`else`
`6517`	`6517`	`{`
`6518`		`- effectp->setResetAnimations(false);`
	`6518`	`+ avatar->setResetAnimations(false);`
`6519`	`6519`	`}`
`6520`	`6520`	`}`
`6521`	`6521`	`return true;`
`@@ -6543,7 +6543,7 @@ class LLAvatarResetSkeletonAndAnimations : public view_listener_t`
`6543`	`6543`	`LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());`
`6544`	`6544`	`if (avatar)`
`6545`	`6545`	`{`
`6546`		`- if(avatar->getID() == gAgent.getID())`
	`6546`	`+ if(avatar->getID() == gAgentID)`
`6547`	`6547`	`{`
`6548`	`6548`	`LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);`
`6549`	`6549`	`effectp->setSourceObject(gAgentAvatarp);`
`@@ -6552,7 +6552,7 @@ class LLAvatarResetSkeletonAndAnimations : public view_listener_t`
`6552`	`6552`	`}`
`6553`	`6553`	`else`
`6554`	`6554`	`{`
`6555`		`- effectp->setResetAnimations(true);`
	`6555`	`+ avatar->setResetAnimations(true);`
`6556`	`6556`	`}`
`6557`	`6557`	`}`
`6558`	`6558`	`return true;`
`@@ -6566,7 +6566,7 @@ class LLAvatarResetSelfSkeletonAndAnimations : public view_listener_t`
`6566`	`6566`	`LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject());`
`6567`	`6567`	`if (avatar)`
`6568`	`6568`	`{`
`6569`		`- if(avatar->getID() == gAgent.getID())`
	`6569`	`+ if(avatar->getID() == gAgentID)`
`6570`	`6570`	`{`
`6571`	`6571`	`LLHUDEffectResetSkeleton* effectp = (LLHUDEffectResetSkeleton*)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_RESET_SKELETON, true);`
`6572`	`6572`	`effectp->setSourceObject(gAgentAvatarp);`
`@@ -6575,7 +6575,7 @@ class LLAvatarResetSelfSkeletonAndAnimations : public view_listener_t`
`6575`	`6575`	`}`
`6576`	`6576`	`else`
`6577`	`6577`	`{`
`6578`		`- effectp->setResetAnimations(true);`
	`6578`	`+ avatar->setResetAnimations(true);`
`6579`	`6579`	`}`
`6580`	`6580`	`}`
`6581`	`6581`	`else`