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

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

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