4 files changed, 45 insertions, 18 deletions

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 6fe4863..89ba09c 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -5822,18 +5822,13 @@ bool LLAgent::teleportCore(bool is_local)
                 return false;
         }
 
-        // Stop all animation before actual teleporting 
+        // Cease sitting on the current object, if any.
         LLVOAvatar* avatarp = gAgent.getAvatarObject();
         if (avatarp)
-        {
-                for ( LLVOAvatar::AnimIterator anim_it= avatarp->mPlayingAnimations.begin()
-                        ; anim_it != avatarp->mPlayingAnimations.end()
-                        ; anim_it++)
-                {
-                        avatarp->stopMotion(anim_it->first);
-                }
-                avatarp->processAnimationStateChanges();
-        }
+                avatarp->getOffObject();
+
+        // Stop all animations before actual teleporting 
+        stopCurrentAnimations();
 
         // Don't call LLFirstUse::useTeleport because we don't know
         // yet if the teleport will succeed.  Look in 
@@ -6034,6 +6029,42 @@ void LLAgent::setTeleportState(ETeleportState state)
         }
 }
 
+void LLAgent::stopCurrentAnimations()
+{
+        // This function stops all current overriding animations on this
+        // avatar, propagating this change back to the server.
+
+        LLVOAvatar* avatarp = gAgent.getAvatarObject();
+        if (avatarp)
+        {
+                for ( LLVOAvatar::AnimIterator anim_it =
+                              avatarp->mPlayingAnimations.begin();
+                      anim_it != avatarp->mPlayingAnimations.end();
+                      anim_it++)
+                {
+                        if (anim_it->first ==
+                            ANIM_AGENT_SIT_GROUND_CONSTRAINED)
+                        {
+                                // don't cancel a ground-sit anim, as viewers
+                                // use this animation's status in
+                                // determining whether we're sitting. ick.
+                        }
+                        else
+                        {
+                                // stop this animation locally
+                                avatarp->stopMotion(anim_it->first, TRUE);
+                                // ...and tell the server to tell everyone.
+                                sendAnimationRequest(anim_it->first, ANIM_REQUEST_STOP);
+                        }
+                }
+
+                // re-assert at least the default standing animation, because
+                // viewers get confused by avs with no associated anims.
+                sendAnimationRequest(ANIM_AGENT_STAND,
+                                     ANIM_REQUEST_START);
+        }
+}
+
 void LLAgent::fidget()
 {
         if (!getAFK())
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index 7515781..a4a930f 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -372,6 +372,7 @@ public:
         BOOL canFly();
 
         // Animation functions
+        void                    stopCurrentAnimations();
         void                    requestStopMotion( LLMotion* motion );
         void                    onAnimStop(const LLUUID& id);
 
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 9374a36..aa5e791 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -4211,12 +4211,7 @@ class LLToolsStopAllAnimations : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                LLVOAvatar* avatarp = gAgent.getAvatarObject();         
-                if (avatarp)
-                {
-                        avatarp->deactivateAllMotions();        
-                        avatarp->startDefaultMotions();
-                }
+                gAgent.stopCurrentAnimations();
                 return true;
         }
 };
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 6c88b83..72b828d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -445,8 +445,8 @@
     <menu_item_call name="Set Busy" label="Set Busy">
       <on_click function="World.SetBusy" userdata="" />
     </menu_item_call>
-    <menu_item_call name="Stop All Animations" enabled="false"
-                    label="Stop All Animations">
+    <menu_item_call name="Stop Animating My Avatar" enabled="false"
+                    label="Stop Animating My Avatar">
       <on_click function="Tools.StopAllAnimations" userdata="" />
     </menu_item_call>
     <menu_item_call name="Release Keys" enabled="false" label="Release Keys">