#2997 The 'Reset Skeleton' option is missing in the right-click menu

LLGuru · LLGuru · commit 15d4bb635307 · 2024-11-06T12:01:37.000+01:00
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
@@ -6722,11 +6722,8 @@ class LLAvatarEnableResetSkeleton : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
     {
-        if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()))
-        {
-            return true;
-        }
-        return false;
+        LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();
+        return obj && obj->getAvatar();
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -6722,11 +6722,8 @@ class LLAvatarEnableResetSkeleton : public view_listener_t`
`6722`	`6722`	`{`
`6723`	`6723`	`bool handleEvent(const LLSD& userdata)`
`6724`	`6724`	`{`
`6725`		`- if (LLVOAvatar* avatar = find_avatar_from_object(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()))`
`6726`		`- {`
`6727`		`- return true;`
`6728`		`- }`
`6729`		`- return false;`
	`6725`	`+ LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject();`
	`6726`	`+ return obj && obj->getAvatar();`
`6730`	`6727`	`}`
`6731`	`6728`	`};`
`6732`	`6729`