MAINT-6915 - fixed a bug in Reset Skeletons And Animations. For self avatar, this will now be equivalent to reset skeleton + stop animating me.

1 files changed, 12 insertions, 1 deletions

diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp
index 77a526f518..b25ced4b7e 100644
--- a/indra/newview/llvoavatar.cpp
+++ b/indra/newview/llvoavatar.cpp
@@ -1914,7 +1914,18 @@ void LLVOAvatar::resetSkeleton(bool reset_animations)
     // Animations
     if (reset_animations)
     {
-        resetAnimations();
+        if (isSelf())
+        {
+            // This is equivalent to "Stop Animating Me". Will reset
+            // all animations and propagate the changes to other
+            // viewers.
+            gAgent.stopCurrentAnimations();
+        }
+        else
+        {
+            // Local viewer-side reset for non-self avatars.
+            resetAnimations();
+        }
     }
     
     LL_DEBUGS("Avatar") << avString() << " reset ends" << LL_ENDL;