aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDan Lake2011-11-15 17:09:17 -0800
committerDan Lake2011-11-15 17:09:17 -0800
commitbaa65d4a15c0907434bb26f2ac85ad881dd3c3ca (patch)
tree6bd14a8aa322385c69c31c20068bedf7f17204f6 /OpenSim/Region/Framework
parentComment out the vebose logging on HGFriendsModule. (diff)
downloadopensim-SC_OLD-baa65d4a15c0907434bb26f2ac85ad881dd3c3ca.zip
opensim-SC_OLD-baa65d4a15c0907434bb26f2ac85ad881dd3c3ca.tar.gz
opensim-SC_OLD-baa65d4a15c0907434bb26f2ac85ad881dd3c3ca.tar.bz2
opensim-SC_OLD-baa65d4a15c0907434bb26f2ac85ad881dd3c3ca.tar.xz
In AddNewClient, iterator over copy of entities rather than copying under read lock
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index c1cbbd4..f10789b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2544,11 +2544,12 @@ namespace OpenSim.Region.Framework.Scenes
2544 // Send all scene object to the new client 2544 // Send all scene object to the new client
2545 Util.FireAndForget(delegate 2545 Util.FireAndForget(delegate
2546 { 2546 {
2547 Entities.ForEach(delegate(EntityBase e) 2547 EntityBase[] entities = Entities.GetEntities();
2548 foreach(EntityBase e in entities)
2548 { 2549 {
2549 if (e != null && e is SceneObjectGroup) 2550 if (e != null && e is SceneObjectGroup)
2550 ((SceneObjectGroup)e).SendFullUpdateToClient(client); 2551 ((SceneObjectGroup)e).SendFullUpdateToClient(client);
2551 }); 2552 }
2552 }); 2553 });
2553 } 2554 }
2554 2555