1 files changed, 18 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 30f3e04..ab2abed 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1637,7 +1637,24 @@ namespace OpenSim.Region.Environment.Scenes
             {
                 if (avatars[i] != this)
                 {
-                    CoarseLocations.Add(avatars[i].m_pos);
+                    if (avatars[i].ParentID != 0)
+                    {
+                        // sitting avatar
+                        SceneObjectPart sop = m_scene.GetSceneObjectPart(avatars[i].ParentID);
+                        if (sop != null)
+                        {
+                            CoarseLocations.Add(sop.AbsolutePosition + avatars[i].m_pos);
+                        }
+                        else
+                        {
+                            // we can't find the parent..  ! arg!
+                            CoarseLocations.Add(avatars[i].m_pos);
+                        }
+                    }
+                    else
+                    {
+                        CoarseLocations.Add(avatars[i].m_pos);
+                    }
                 }
             }