Potential Fix #1 for 0001392: Shift+Drag now causes an unhandled 'Object reference not set to an instance of object' exception

1 files changed, 9 insertions, 3 deletions

diff --git a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
index 29e3143..1c04796 100644
--- a/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
@@ -583,11 +583,17 @@ namespace OpenSim.Region.Environment.Modules.World.Land
         public void UpdateLandPrimCounts()
         {
             ResetAllLandPrimCounts();
-            foreach (EntityBase obj in m_scene.Entities.Values)
+            lock (m_scene.Entities)
             {
-                if (obj is SceneObjectGroup)
+                foreach (EntityBase obj in m_scene.Entities.Values)
                 {
-                    m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
+                    if (obj != null)
+                    {
+                        if (obj is SceneObjectGroup)
+                        {
+                            m_scene.EventManager.TriggerParcelPrimCountAdd((SceneObjectGroup)obj);
+                        }
+                    }
                 }
             }
             FinalizeLandPrimCountUpdate();