1 files changed, 21 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index ecc7f40..7eebb99 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -223,8 +223,27 @@ namespace OpenSim.Region.Framework.Scenes
                 if (sp.IsChildAgent)
                     return;
 
-                coarseLocations.Add(sp.AbsolutePosition);
-                avatarUUIDs.Add(sp.UUID);
+                if (sp.ParentID != 0)
+                {
+                    // sitting avatar
+                    SceneObjectPart sop = m_parentScene.GetSceneObjectPart(sp.ParentID);
+                    if (sop != null)
+                    {
+                        coarseLocations.Add(sop.AbsolutePosition + sp.OffsetPosition);
+                        avatarUUIDs.Add(sp.UUID);
+                    }
+                    else
+                    {
+                        // we can't find the parent..  ! arg!
+                        coarseLocations.Add(sp.AbsolutePosition);
+                        avatarUUIDs.Add(sp.UUID);
+                    }
+                }
+                else
+                {
+                    coarseLocations.Add(sp.AbsolutePosition);
+                    avatarUUIDs.Add(sp.UUID);
+                }
             }
         }