1 files changed, 7 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index e28a523..8e93aae 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -602,10 +602,13 @@ namespace OpenSim.Region.Environment.Scenes
                     m_pendingObjects = new Queue<SceneObjectGroup>();
 
                     List<EntityBase> ents = new List<EntityBase>(m_scene.Entities.Values);
-                    ents.Sort(delegate(EntityBase a, EntityBase b)
-                    {
-                        return Vector3.Distance(AbsolutePosition, a.AbsolutePosition).CompareTo(Vector3.Distance(AbsolutePosition, b.AbsolutePosition));
-                    });
+                    if (!m_isChildAgent) // Proximity sort makes no sense for
+                    {                    // Child agents
+                        ents.Sort(delegate(EntityBase a, EntityBase b)
+                        {
+                            return Vector3.Distance(AbsolutePosition, a.AbsolutePosition).CompareTo(Vector3.Distance(AbsolutePosition, b.AbsolutePosition));
+                        });
+                    }
 
                     foreach (EntityBase e in ents)
                         if (e is SceneObjectGroup)