Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to

the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:

ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar

There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 5427b68..58d9455 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -658,14 +658,14 @@ namespace OpenSim.Region.CoreModules.World.Estate
             if (!Scene.Permissions.CanIssueEstateCommand(remover_client.AgentId, false))
                 return;
 
-            Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            Scene.ForEachRootClient(delegate(IClientAPI client)
             {
-                if (sp.UUID != senderID)
+                if (client.AgentId != senderID)
                 {
                     // make sure they are still there, we could be working down a long list
                     // Also make sure they are actually in the region
                     ScenePresence p;
-                    if(Scene.TryGetScenePresence(sp.UUID, out p))
+                    if(Scene.TryGetScenePresence(client.AgentId, out p))
                         Scene.TeleportClientHome(p.UUID, p.ControllingClient);
                 }
             });
@@ -927,9 +927,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         public void sendRegionInfoPacketToAll()
         {
-            Scene.ForEachRootScenePresence(delegate(ScenePresence sp)
+            Scene.ForEachRootClient(delegate(IClientAPI client)
             {
-                HandleRegionInfoRequest(sp.ControllingClient);
+                HandleRegionInfoRequest(client);
             });
         }