OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Region/Environment/Scenes/Scene.cs
View File

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