aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTedd Hansen2008-01-18 20:52:53 +0000
committerTedd Hansen2008-01-18 20:52:53 +0000
commit0d8b8d340c88864d7162bfa3a0533741cbe82b6f (patch)
treeeb2c3a45b8bd20fb700ae122fd5a0e8dd39d2374 /OpenSim/Region/Environment/Scenes
parentAdded a mutex lock on loadAllLandObjectsFromStorage so maybe just MAYBE we ca... (diff)
downloadopensim-SC_OLD-0d8b8d340c88864d7162bfa3a0533741cbe82b6f.zip
opensim-SC_OLD-0d8b8d340c88864d7162bfa3a0533741cbe82b6f.tar.gz
opensim-SC_OLD-0d8b8d340c88864d7162bfa3a0533741cbe82b6f.tar.bz2
opensim-SC_OLD-0d8b8d340c88864d7162bfa3a0533741cbe82b6f.tar.xz
Nope, that didn't do it - trying lock on performParcelPrimCountUpdate instead
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
1 files changed, 8 insertions, 8 deletions
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
896 896
897 #region Load Land 897 #region Load Land
898 898
899 private static readonly object _loadAllLAndMutex = new object();
900 public void loadAllLandObjectsFromStorage() 899 public void loadAllLandObjectsFromStorage()
901 { 900 {
902 lock (_loadAllLAndMutex)
903 {
904 MainLog.Instance.Verbose("SCENE", "Loading land objects from storage"); 901 MainLog.Instance.Verbose("SCENE", "Loading land objects from storage");
905 List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID); 902 List<LandData> landData = m_storageManager.DataStore.LoadLandObjects(RegionInfo.RegionID);
906 if (landData.Count == 0) 903 if (landData.Count == 0)
@@ -911,7 +908,6 @@ namespace OpenSim.Region.Environment.Scenes
911 { 908 {
912 m_LandManager.IncomingLandObjectsFromStorage(landData); 909 m_LandManager.IncomingLandObjectsFromStorage(landData);
913 } 910 }
914 }
915 } 911 }
916 912
917 #endregion 913 #endregion
@@ -1700,15 +1696,19 @@ namespace OpenSim.Region.Environment.Scenes
1700 return LLUUID.Zero; 1696 return LLUUID.Zero;
1701 } 1697 }
1702 1698
1699 private readonly const object _performParcelPrimCountUpdateMutex = new object();
1703 /// <summary> 1700 /// <summary>
1704 /// 1701 ///
1705 /// </summary> 1702 /// </summary>
1706 public void performParcelPrimCountUpdate() 1703 public void performParcelPrimCountUpdate()
1707 { 1704 {
1708 m_LandManager.resetAllLandPrimCounts(); 1705 lock (performParcelPrimCountUpdate)
1709 m_eventManager.TriggerParcelPrimCountUpdate(); 1706 {
1710 m_LandManager.finalizeLandPrimCountUpdate(); 1707 m_LandManager.resetAllLandPrimCounts();
1711 m_LandManager.landPrimCountTainted = false; 1708 m_eventManager.TriggerParcelPrimCountUpdate();
1709 m_LandManager.finalizeLandPrimCountUpdate();
1710 m_LandManager.landPrimCountTainted = false;
1711 }
1712 } 1712 }
1713 1713
1714 /// <summary> 1714 /// <summary>