aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorKitto Flora2010-03-19 13:26:34 -0400
committerKitto Flora2010-03-19 13:26:34 -0400
commit3ea72eeabb12cff4f71523f501450a7df38a17b1 (patch)
treee265e439af90c201505c6fe4cf094212ba551da6
parentMerge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff)
downloadopensim-SC_OLD-3ea72eeabb12cff4f71523f501450a7df38a17b1.zip
opensim-SC_OLD-3ea72eeabb12cff4f71523f501450a7df38a17b1.tar.gz
opensim-SC_OLD-3ea72eeabb12cff4f71523f501450a7df38a17b1.tar.bz2
opensim-SC_OLD-3ea72eeabb12cff4f71523f501450a7df38a17b1.tar.xz
Fix sit with autopilot.
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 123d6f3..2603fe1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -455,8 +455,9 @@ namespace OpenSim.Region.Framework.Scenes
455 get 455 get
456 { 456 {
457 PhysicsActor actor = m_physicsActor; 457 PhysicsActor actor = m_physicsActor;
458 if (actor != null) 458// if (actor != null)
459 m_pos = actor.Position; 459 if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting!
460 m_pos = actor.Position;
460 461
461 return m_parentPosition + m_pos; 462 return m_parentPosition + m_pos;
462 } 463 }
@@ -476,7 +477,8 @@ namespace OpenSim.Region.Framework.Scenes
476 } 477 }
477 } 478 }
478 479
479 m_pos = value; 480 if (m_parentID == 0) // KF Do NOT update m_pos here if Av is sitting!
481 m_pos = value;
480 m_parentPosition = Vector3.Zero; 482 m_parentPosition = Vector3.Zero;
481 } 483 }
482 } 484 }