aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
1 files changed, 9 insertions, 2 deletions
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
547 } 547 }
548 } 548 }
549 549
550 m_pos = value; 550 // Don't update while sitting
551 ParentPosition = Vector3.Zero; 551 if (ParentID == 0)
552 {
553 m_pos = value;
554 ParentPosition = Vector3.Zero;
555 }
552 556
553// m_log.DebugFormat( 557// m_log.DebugFormat(
554// "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}", 558// "[ENTITY BASE]: In {0} set AbsolutePosition of {1} to {2}",
@@ -2758,6 +2762,9 @@ namespace OpenSim.Region.Framework.Scenes
2758 if (IsChildAgent) 2762 if (IsChildAgent)
2759 return; 2763 return;
2760 2764
2765 if (ParentID != 0)
2766 return;
2767
2761 Vector3 pos2 = AbsolutePosition; 2768 Vector3 pos2 = AbsolutePosition;
2762 Vector3 vel = Velocity; 2769 Vector3 vel = Velocity;
2763 int neighbor = 0; 2770 int neighbor = 0;