Added a mutex lock on loadAllLandObjectsFromStorage so maybe just MAYBE we can get rid of that annoying startup crash...

1 files changed, 12 insertions, 8 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3a0e1b9..8374dcf 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -896,17 +896,21 @@ namespace OpenSim.Region.Environment.Scenes
 
         #region Load Land
 
+        private static readonly object _loadAllLAndMutex = new object();
         public void loadAllLandObjectsFromStorage()
         {
-            MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
-            List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
-            if (landData.Count == 0)
+            lock (_loadAllLAndMutex)
             {
-                m_LandManager.NoLandDataFromStorage();
-            }
-            else
-            {
-                m_LandManager.IncomingLandObjectsFromStorage(landData);
+                MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
+                List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
+                if (landData.Count == 0)
+                {
+                    m_LandManager.NoLandDataFromStorage();
+                }
+                else
+                {
+                    m_LandManager.IncomingLandObjectsFromStorage(landData);
+                }
             }
         }