1 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 3460e8f..a0bab1a 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -622,10 +622,16 @@ namespace OpenSim.Region.Environment.Scenes
 
             if (PhysicsActor == null)
             {
-                // Console.WriteLine("DEBUG: HandleAgentUpdate: null PhysicsActor!");
                 return;
             }
 
+            if ((flags & (uint)AgentManager.ControlFlags.AGENT_CONTROL_SIT_ON_GROUND) != 0)
+            {
+                // TODO: This doesn't quite work yet -- probably a parent ID problem
+                // m_parentID = (what should this be?)
+                // SetMovementAnimation(Animations.AnimsLLUUID["SIT_GROUND"], 1);
+            }
+
             if (m_allowMovement)
             {
                 int i = 0;
@@ -693,7 +699,8 @@ namespace OpenSim.Region.Environment.Scenes
                 m_pos += m_parentPosition + new LLVector3(0.0f, 0.0f, 2.0f * m_sitAvatarHeight);
                 m_parentPosition = new LLVector3();
 
-                AddToPhysicalScene();
+                if (m_physicsActor == null)
+                    AddToPhysicalScene();
 
                 m_parentID = 0;
                 SendFullUpdateToAllClients();