Report current position instead of position at the time we sat down

2 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 68681c9..91b7d35 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4732,7 +4732,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             // Update sitting avatar chat position
 
-            p.AbsolutePosition = GroupPosition;
+            p.AbsolutePosition = GroupPosition + OffsetPosition + m_sitTargetPosition;
         }
     }
 }
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b6f67f7..7a7816a 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -466,6 +466,13 @@ namespace OpenSim.Region.Framework.Scenes
                 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);
+                    m_parentPosition = part.AbsolutePosition;
+                }
+
                 return m_parentPosition + m_pos;
             }
             set