1 files changed, 14 insertions, 19 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index c2e3370..3b84734 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -414,22 +414,18 @@ namespace OpenSim.Region.Framework.Scenes
             ForEachCurrentScene(
                 delegate(Scene scene)
                 {
-                    ScenePresence[] scenePresences = scene.GetScenePresences();
-
-                    for (int i = 0; i < scenePresences.Length; i++)
+                    scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
                     {
-                        ScenePresence scenePresence = scenePresences[i];
-
                         if (!scenePresence.IsChildAgent)
                         {
-                            m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
+                            m_log.DebugFormat("Packet debug for {0} {1} set to {2}",
                                               scenePresence.Firstname,
                                               scenePresence.Lastname,
                                               newDebug);
 
                             scenePresence.ControllingClient.SetDebugPacketLevel(newDebug);
                         }
-                    }
+                    });
                 }
             );
         }
@@ -441,14 +437,11 @@ namespace OpenSim.Region.Framework.Scenes
             ForEachCurrentScene(
                 delegate(Scene scene)
                 {
-                    ScenePresence[] scenePresences = scene.GetScenePresences();
-
-                    for (int i = 0; i < scenePresences.Length; i++)
+                    scene.ForEachScenePresence(delegate(ScenePresence scenePresence)
                     {
-                        ScenePresence scenePresence = scenePresences[i];
                         if (!scenePresence.IsChildAgent)
                             avatars.Add(scenePresence);
-                    }
+                    });
                 }
             );
 
@@ -461,18 +454,20 @@ namespace OpenSim.Region.Framework.Scenes
 
             ForEachCurrentScene(delegate(Scene scene)
             {
-                ScenePresence[] scenePresences = scene.GetScenePresences();
-                presences.AddRange(scenePresences);
+                scene.ForEachScenePresence(delegate(ScenePresence sp)
+                {
+                    presences.Add(sp);
+                });
             });
 
             return presences;
         }
 
-        public RegionInfo GetRegionInfo(ulong regionHandle)
+        public RegionInfo GetRegionInfo(UUID regionID)
         {
             foreach (Scene scene in m_localScenes)
             {
-                if (scene.RegionInfo.RegionHandle == regionHandle)
+                if (scene.RegionInfo.RegionID == regionID)
                 {
                     return scene.RegionInfo;
                 }
@@ -491,11 +486,11 @@ namespace OpenSim.Region.Framework.Scenes
             ForEachCurrentScene(delegate(Scene scene) { scene.HandleEditCommand(cmdparams); });
         }
 
-        public bool TryGetAvatar(UUID avatarId, out ScenePresence avatar)
+        public bool TryGetScenePresence(UUID avatarId, out ScenePresence avatar)
         {
             foreach (Scene scene in m_localScenes)
             {
-                if (scene.TryGetAvatar(avatarId, out avatar))
+                if (scene.TryGetScenePresence(avatarId, out avatar))
                 {
                     return true;
                 }
@@ -510,7 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
             ScenePresence avatar = null;
             foreach (Scene mScene in m_localScenes)
             {
-                if (mScene.TryGetAvatar(avatarId, out avatar))
+                if (mScene.TryGetScenePresence(avatarId, out avatar))
                 {
                     scene = mScene;
                     return true;