#2997 Fix Reset Skeleton not working on animesh objects

marchcat · marchcat · commit b4a6af57a667 · 2026-01-30T07:41:59.000+02:00
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
@@ -8712,6 +8712,12 @@ LLVOAvatar* find_avatar_from_object(LLViewerObject* object)
         }
         else if( !object->isAvatar() )
         {
+            // Check for animesh objects (animated objects with a control avatar)
+            LLVOAvatar* avatar = object->getAvatar();
+            if (avatar)
+            {
+                return avatar;
+            }
             object = NULL;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -8712,6 +8712,12 @@ LLVOAvatar* find_avatar_from_object(LLViewerObject* object)`
`8712`	`8712`	`}`
`8713`	`8713`	`else if( !object->isAvatar() )`
`8714`	`8714`	`{`
	`8715`	`+ // Check for animesh objects (animated objects with a control avatar)`
	`8716`	`+ LLVOAvatar* avatar = object->getAvatar();`
	`8717`	`+ if (avatar)`
	`8718`	`+ {`
	`8719`	`+ return avatar;`
	`8720`	`+ }`
`8715`	`8721`	`object = NULL;`
`8716`	`8722`	`}`
`8717`	`8723`	`}`