From 859bc717a4fe4cd5810ad9889cfb9b1e7f5c2046 Mon Sep 17 00:00:00 2001
From: Dan Lake
Date: Fri, 19 Mar 2010 05:51:16 -0700
Subject: Cleaned up access to scenepresences in scenegraph. GetScenePresences
 and GetAvatars have been removed to consolidate locking and iteration within
 SceneGraph. All callers which used these to then iterate over presences have
 been refactored to instead pass their delegates to
 Scene.ForEachScenePresence(Action<ScenePresence>).

---
 OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs')

diff --git a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
index a567413..dcbd717 100644
--- a/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
+++ b/OpenSim/Region/UserStatistics/ActiveConnectionsAJAX.cs
@@ -68,17 +68,15 @@ namespace OpenSim.Region.UserStatistics
             HTMLUtil.OL_O(ref output, "");
             foreach (Scene scene in all_scenes)
             {
-                List<ScenePresence> avatarInScene = scene.GetScenePresences();
-
                 HTMLUtil.LI_O(ref output, String.Empty);
                 output.Append(scene.RegionInfo.RegionName);
                 HTMLUtil.OL_O(ref output, String.Empty);
-                foreach (ScenePresence av in avatarInScene)
+                scene.ForEachScenePresence(delegate(ScenePresence av)
                 {
-                    Dictionary<string,string> queues = new Dictionary<string, string>();
+                    Dictionary<string, string> queues = new Dictionary<string, string>();
                     if (av.ControllingClient is IStatsCollector)
                     {
-                        IStatsCollector isClient = (IStatsCollector) av.ControllingClient;
+                        IStatsCollector isClient = (IStatsCollector)av.ControllingClient;
                         queues = decodeQueueReport(isClient.Report());
                     }
                     HTMLUtil.LI_O(ref output, String.Empty);
@@ -92,8 +90,8 @@ namespace OpenSim.Region.UserStatistics
                     else
                     {
                         output.Append(string.Format("<br /><NOBR>Position: <{0},{1},{2}></NOBR>", (int)av.AbsolutePosition.X,
-                                                    (int) av.AbsolutePosition.Y,
-                                                    (int) av.AbsolutePosition.Z));
+                                                    (int)av.AbsolutePosition.Y,
+                                                    (int)av.AbsolutePosition.Z));
                     }
                     Dictionary<string, int> throttles = DecodeClientThrottles(av.ControllingClient.GetThrottlesPacked(1));
 
@@ -124,7 +122,7 @@ namespace OpenSim.Region.UserStatistics
 
                     HTMLUtil.UL_C(ref output);
                     HTMLUtil.LI_C(ref output);
-                }
+                });
                 HTMLUtil.OL_C(ref output);
             }
             HTMLUtil.OL_C(ref output);
-- 
cgit v1.1