1 files changed, 27 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 98a3b29..1e749da 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -464,16 +464,33 @@ namespace OpenSim.Region.Framework.Scenes
 //                if (actor != null)
                 if ((actor != null) && (m_parentID == 0))   // KF Do NOT update m_pos here if Av is sitting!
                     m_pos = actor.Position;
-
-                // If we're sitting, we need to update our position
-                if (m_parentID != 0)
-                {
-                    SceneObjectPart part = m_scene.GetSceneObjectPart(m_parentID);
-                    if (part != null)
-                        m_parentPosition = part.AbsolutePosition;
-                }
-
-                return m_parentPosition + m_pos;
+                else                                                                        // OS Mantis #4063
+                {                                                                           // OS Mantis #4063
+                    // 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);      // OS Mantis #4063
+                        if (part != null)                                                   // OS Mantis #4063
+                        {                                                                   // 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_pos;                                                               // OS Mantis #4063
             }
             set
             {