From 0d8b8d340c88864d7162bfa3a0533741cbe82b6f Mon Sep 17 00:00:00 2001
From: Tedd Hansen
Date: Fri, 18 Jan 2008 20:52:53 +0000
Subject: Nope, that didn't do it - trying lock on performParcelPrimCountUpdate
 instead

---
 OpenSim/Region/Environment/Scenes/Scene.cs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 8374dcf..3a6bb05 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -896,11 +896,8 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Load Land
 
-        private static readonly object _loadAllLAndMutex = new object();
         public void loadAllLandObjectsFromStorage()
         {
-            lock (_loadAllLAndMutex)
-            {
                 MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
                 List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
                 if (landData.Count == 0)
@@ -911,7 +908,6 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     m_LandManager.IncomingLandObjectsFromStorage(landData);
                 }
-            }
         }
 
         #endregion
@@ -1700,15 +1696,19 @@ namespace OpenSim.Region.Environment.Scenes
             return LLUUID.Zero;
         }
 
+        private readonly const object _performParcelPrimCountUpdateMutex = new object();
         /// <summary>
         /// 
         /// </summary>
         public void performParcelPrimCountUpdate()
         {
-            m_LandManager.resetAllLandPrimCounts();
-            m_eventManager.TriggerParcelPrimCountUpdate();
-            m_LandManager.finalizeLandPrimCountUpdate();
-            m_LandManager.landPrimCountTainted = false;
+            lock (performParcelPrimCountUpdate)
+            {
+                m_LandManager.resetAllLandPrimCounts();
+                m_eventManager.TriggerParcelPrimCountUpdate();
+                m_LandManager.finalizeLandPrimCountUpdate();
+                m_LandManager.landPrimCountTainted = false;
+            }
         }
 
         /// <summary>
-- 
cgit v1.1