From 2a8ff937d513abbd84a96cbfdbe74bc710b60e6a Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Mon, 24 Nov 2008 15:14:33 +0000 Subject: * Removed more locks on Entities * Entities should now in theory be lock-free externally. * Other properties may cause blocking however[?]. * ScenePresence maintains separate locks so isn't fixed by this commit. --- .../Environment/Modules/World/Land/LandManagementModule.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World') diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs index d33201f..68aee86 100644 --- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs @@ -664,16 +664,13 @@ namespace OpenSim.Region.Environment.Modules.World.Land public void UpdateLandPrimCounts() { ResetAllLandPrimCounts(); - lock (m_scene.Entities) + foreach (EntityBase obj in m_scene.Entities) { - foreach (EntityBase obj in m_scene.Entities) + if (obj != null) { - if (obj != null) + if ((obj is SceneObjectGroup) && !obj.IsDeleted && !((SceneObjectGroup) obj).IsAttachment) { - if ((obj is SceneObjectGroup) && !((SceneObjectGroup)obj).IsDeleted && !((SceneObjectGroup)obj).IsAttachment) - { - m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj); - } + m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup) obj); } } } -- cgit v1.1