OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix sit with autopilot.

avinationmerge
Kitto Flora 2010-03-19 13:26:34 -04:00
parent 8cbd0d3b5f
commit 3ea72eeabb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -455,7 +455,8 @@ namespace OpenSim.Region.Framework.Scenes
get get
{ {
PhysicsActor actor = m_physicsActor; PhysicsActor actor = m_physicsActor;
if (actor != null) // if (actor != null)
if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting!
m_pos = actor.Position; m_pos = actor.Position;
return m_parentPosition + m_pos; return m_parentPosition + m_pos;
@ -476,6 +477,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
if (m_parentID == 0) // KF Do NOT update m_pos here if Av is sitting!
m_pos = value; m_pos = value;
m_parentPosition = Vector3.Zero; m_parentPosition = Vector3.Zero;
} }