Rev 1971 : The Lbsa71 vintage commit

  * Refactored to prepare for some serious restructuring

1 files changed, 4 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/EstateManager.cs b/OpenSim/Region/Environment/EstateManager.cs
index 30d206f..ac710ad 100644
--- a/OpenSim/Region/Environment/EstateManager.cs
+++ b/OpenSim/Region/Environment/EstateManager.cs
@@ -34,7 +34,6 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Types;
 using OpenSim.Region.Environment.Scenes;
-using Avatar = OpenSim.Region.Environment.Scenes.ScenePresence;
 
 
 namespace OpenSim.Region.Environment
@@ -332,7 +331,7 @@ namespace OpenSim.Region.Environment
 
         public void sendRegionInfoPacketToAll()
         {
-            List<Avatar> avatars = m_scene.RequestAvatarList();
+            List<ScenePresence> avatars = m_scene.GetAvatars();
 
             for (int i = 0; i < avatars.Count; i++)
             {
@@ -342,12 +341,10 @@ namespace OpenSim.Region.Environment
 
         public void sendRegionHandshakeToAll()
         {
-            List<Avatar> avatars = m_scene.RequestAvatarList();
-
-            for (int i = 0; i < avatars.Count; i++)
+            m_scene.ForEachScenePresence( delegate( ScenePresence scenePresence )
             {
-                sendRegionHandshake(avatars[i].ControllingClient);
-            }
+                sendRegionHandshake(scenePresence.ControllingClient);
+            });
         }
 
         public void sendRegionInfoPacket(IClientAPI remote_client)