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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-11-27 01:25:02 +00:00
parent e05f728b08 6ed63487d9
commit a1ab2a2244
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -464,16 +464,33 @@ namespace OpenSim.Region.Framework.Scenes
// if (actor != null) // if (actor != null)
if ((actor != null) && (m_parentID == 0)) // KF Do NOT update m_pos here if Av is sitting! 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;
else // OS Mantis #4063
// If we're sitting, we need to update our position { // OS Mantis #4063
if (m_parentID != 0) // OpenSim Mantis #4063. Obtain the correct position of a seated avatar. In addition
// to providing the correct position while the avatar is seated, this value will also
// be used as the location to unsit to.
//
// If m_parentID is not 0, assume we are a seated avatar and we should return the
// position based on the sittarget offset and rotation of the prim we are seated on.
//
// Generally, m_pos will contain the position of the avator in the sim unless the avatar
// is on a sit target. While on a sit target, m_pos will contain the desired offset
// without the parent rotation applied.
if (m_parentID != 0) // OS Mantis #4063
{ {
SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID); // OS Mantis #4063
if (part != null) if (part != null) // OS Mantis #4063
m_parentPosition = part.AbsolutePosition; { // OS Mantis #4064
return m_parentPosition + (m_pos * part.GetWorldRotation()); // OS Mantis #4063
} }
else // OS Mantis #4064
{ // OS Mantis #4063
return m_parentPosition + m_pos; // OS Mantis #4064
} // OS Mantis #4063
} // OS Mantis #4063
} // OS Mantis #4063
return m_parentPosition + m_pos; return m_pos; // OS Mantis #4063
} }
set set
{ {