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

ThreadPoolClientBranch
Tedd Hansen 2008-01-18 20:46:53 +00:00
parent b7ab6d705a
commit 8fbac08fb5
1 changed files with 12 additions and 8 deletions

View File

@ -896,7 +896,10 @@ namespace OpenSim.Region.Environment.Scenes
#region Load Land #region Load Land
private static readonly object _loadAllLAndMutex = new object();
public void loadAllLandObjectsFromStorage() public void loadAllLandObjectsFromStorage()
{
lock (_loadAllLAndMutex)
{ {
MainLog.Instance.Verbose("SCENE", "Loading land objects from storage"); MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID); List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
@ -909,6 +912,7 @@ namespace OpenSim.Region.Environment.Scenes
m_LandManager.IncomingLandObjectsFromStorage(landData); m_LandManager.IncomingLandObjectsFromStorage(landData);
} }
} }
}
#endregion #endregion