summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2026-01-30 06:51:22 +0200
committerAndrey Lihatskiy <118752495+marchcat@users.noreply.github.com>2026-01-30 07:41:59 +0200
commitb4a6af57a667d355e7347f1a3c13173b44b361ff (patch)
treeb7e62718843793eae236b8421309560a2187c950
parent3caf20f4c43173393c10b9cecbb266a4f7ff3702 (diff)
#2997 Fix Reset Skeleton not working on animesh objects
-rw-r--r--indra/newview/llviewermenu.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 27185cb69f..c9f10d845f 100644
--- 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;
}
}