Fix thingd so that autoreturn also works when the user is not in the sim.

Also add experimental distance ordering for prims

1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 4517d11..2caeb14 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -580,7 +580,13 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     m_pendingObjects = new Queue<SceneObjectGroup>();
 
-                    foreach (EntityBase e in m_scene.Entities.Values)
+                    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));
+                    });
+
+                    foreach (EntityBase e in ents)
                         if (e is SceneObjectGroup)
                             m_pendingObjects.Enqueue((SceneObjectGroup)e);
                 }