2 files changed, 16 insertions, 0 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 2b0ad12..b4b9f00 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -498,6 +498,17 @@ namespace OpenSim.Region.Environment.Scenes
                         Console.WriteLine(e.Message);
                     }
                 }
+                
+                // TODO if we decide to do sitting in a more SL compatible way (multiple avatars per prim), this has to be fixed, too
+                if(m_sitTargetAvatar != UUID.Zero) {
+                    if (m_parentGroup != null) // TODO can there be a SOP without a SOG?
+                    {
+                        ScenePresence avatar;
+                        if(m_parentGroup.Scene.TryGetAvatar(m_sitTargetAvatar, out avatar)) {
+                            avatar.ParentPosition = GetWorldPosition();
+                        }
+                    }
+                }
 
             }
         }
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index ff043fb..f58bba6 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -287,6 +287,11 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         protected Vector3 m_parentPosition = new Vector3();
+        public Vector3 ParentPosition
+        {
+            get { return m_parentPosition; }
+            set { m_parentPosition = value; }
+        }
 
         /// <summary>
         /// Absolute position of this avatar in 'region cordinates'