fix for mantis #2 from Justin Casey (IBM)

2 files changed, 12 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index efee81b..6fd0cf0 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1580,6 +1580,11 @@ namespace OpenSim.Region.Environment.Scenes
                 List<ScenePresence> avatars = GetScenePresences();
                 for (int i = 0; i < avatars.Count; i++)
                 {
+                    if (avatars[i].ParentID == LocalId)
+                    {
+                        avatars[i].StandUp();
+                    }
+                        
                     avatars[i].ControllingClient.SendKillObject(m_regionHandle, part.LocalID);
                 }
             }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 7927de6..ea8d5c4 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -526,7 +526,6 @@ namespace OpenSim.Region.Environment.Scenes
             if ((flags & (uint) MainAvatar.ControlFlags.AGENT_CONTROL_STAND_UP) != 0)
             {
                 StandUp();
-                UpdateMovementAnimations(true);
             }
 
             if (PhysicsActor == null)
@@ -593,7 +592,11 @@ namespace OpenSim.Region.Environment.Scenes
             
         }
 
-        protected void StandUp()
+        /// <summary>
+        /// Perform the logic necessary to stand the client up.  This method also executes
+        /// the stand animation.
+        /// </summary>
+        public void StandUp()
         {
             if (m_parentID != 0)
             {
@@ -607,6 +610,8 @@ namespace OpenSim.Region.Environment.Scenes
                 m_parentID = 0;
                 SendFullUpdateToAllClients();
             }
+            
+            UpdateMovementAnimations(true);
         }
 
         private void SendSitResponse(IClientAPI remoteClient, LLUUID targetID, LLVector3 offset)
@@ -651,7 +656,6 @@ namespace OpenSim.Region.Environment.Scenes
             if (m_parentID != 0)
             {
                 StandUp();
-                UpdateMovementAnimations(true);
             }
 
             SceneObjectPart part = m_scene.GetSceneObjectPart(targetID);