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

Fix AbsolutePosition for autopilot/sit.

avinationmerge
Kitto Flora 2010-03-17 13:30:48 -04:00
parent d3f33acc1a
commit 6df969894c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -463,7 +463,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;
@ -484,7 +485,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; m_parentPosition = Vector3.Zero;
} }
} }
@ -1267,6 +1269,7 @@ namespace OpenSim.Region.Framework.Scenes
m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902"); m_log.Error("[AVATAR]: NonFinite Avatar position detected... Reset Position. Mantis this please. Error #9999902");
m_pos = m_LastFinitePos; m_pos = m_LastFinitePos;
if (!m_pos.IsFinite()) if (!m_pos.IsFinite())
{ {
m_pos.X = 127f; m_pos.X = 127f;
@ -1904,6 +1907,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
m_avUnscriptedSitPos = Vector3.Zero; // Zero = Sit on prim center m_avUnscriptedSitPos = Vector3.Zero; // Zero = Sit on prim center
autopilotTarget = part.AbsolutePosition; autopilotTarget = part.AbsolutePosition;
//Console.WriteLine("UsSmall autopilotTarget={0}", autopilotTarget);
} }
else return; // occupied small else return; // occupied small
} // end large/small } // end large/small
@ -2280,7 +2284,8 @@ namespace OpenSim.Region.Framework.Scenes
m_pos += SIT_TARGET_ADJUSTMENT; m_pos += SIT_TARGET_ADJUSTMENT;
m_bodyRot = sitTargetOrient; m_bodyRot = sitTargetOrient;
m_parentPosition = part.AbsolutePosition; m_parentPosition = part.AbsolutePosition;
part.IsOccupied = true; part.IsOccupied = true;
Console.WriteLine("Scripted Sit ofset {0}", m_pos);
} }
else else
{ {
@ -3348,6 +3353,7 @@ namespace OpenSim.Region.Framework.Scenes
m_callbackURI = cAgent.CallbackURI; m_callbackURI = cAgent.CallbackURI;
m_pos = cAgent.Position; m_pos = cAgent.Position;
m_velocity = cAgent.Velocity; m_velocity = cAgent.Velocity;
m_CameraCenter = cAgent.Center; m_CameraCenter = cAgent.Center;
//m_avHeight = cAgent.Size.Z; //m_avHeight = cAgent.Size.Z;