Merge branch 'main' into 2024.09-ExtraFPS

1 files changed, 30 insertions, 0 deletions

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c1607eb13f..cbc615b01a 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -6610,6 +6610,35 @@ class LLAvatarToggleSearch : public view_listener_t
     }
 };
 
+// <FS:CR> Resync Animations
+class FSToolsResyncAnimations : public view_listener_t
+{
+    bool handleEvent(const LLSD& userdata)
+    {
+        for (S32 i = 0; i < gObjectList.getNumObjects(); i++)
+        {
+            LLViewerObject* object = gObjectList.getObject(i);
+            if (object &&
+                object->isAvatar())
+            {
+                LLVOAvatar* avatarp = (LLVOAvatar*)object;
+                if (avatarp)
+                {
+                    for (LLVOAvatar::AnimIterator anim_it = avatarp->mPlayingAnimations.begin();
+                         anim_it != avatarp->mPlayingAnimations.end();
+                         anim_it++)
+                    {
+                        avatarp->stopMotion(anim_it->first, true);
+                        avatarp->startMotion(anim_it->first);
+                    }
+                }
+            }
+        }
+        return true;
+    }
+};
+// </FS:CR> Resync Animations
+
 class LLAvatarResetSkeleton : public view_listener_t
 {
     bool handleEvent(const LLSD& userdata)
@@ -10024,6 +10053,7 @@ void initialize_menus()
     view_listener_t::addMenu(new LLAvatarToggleMyProfile(), "Avatar.ToggleMyProfile");
     view_listener_t::addMenu(new LLAvatarTogglePicks(), "Avatar.TogglePicks");
     view_listener_t::addMenu(new LLAvatarToggleSearch(), "Avatar.ToggleSearch");
+    view_listener_t::addMenu(new FSToolsResyncAnimations(), "Tools.ResyncAnimations");  // <FS:CR> Resync Animations
     view_listener_t::addMenu(new LLAvatarResetSkeleton(), "Avatar.ResetSkeleton");
     view_listener_t::addMenu(new LLAvatarEnableResetSkeleton(), "Avatar.EnableResetSkeleton");
     view_listener_t::addMenu(new LLAvatarResetSkeletonAndAnimations(), "Avatar.ResetSkeletonAndAnimations");