From 19d6aa2bc98cbeb6df089d89d8fc07a08fbdfec4 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 4 Dec 2011 20:16:07 +0100
Subject: Don't allow position update on sitting avatar. Don't bounds check
 sitting avatars as they will be crossed by the vehicle and not individually

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 0eaac64..0dd338e 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -547,8 +547,12 @@ namespace OpenSim.Region.Framework.Scenes
                     }
                 }
 
-                m_pos = value;
-                ParentPosition = Vector3.Zero;
+                // Don't update while sitting
+                if (ParentID == 0)
+                {
+                    m_pos = value;
+                    ParentPosition = Vector3.Zero;
+                }
 
 //                m_log.DebugFormat(
 //                    "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
@@ -2758,6 +2762,9 @@ namespace OpenSim.Region.Framework.Scenes
             if (IsChildAgent)
                 return;
 
+            if (ParentID != 0)
+                return;
+
             Vector3 pos2 = AbsolutePosition;
             Vector3 vel = Velocity;
             int neighbor = 0;
-- 
cgit v1.1