diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 5689308..917f6c4 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -45,7 +45,7 @@ using OpenSim.Region.Terrain; | |||
45 | using Caps = OpenSim.Region.Capabilities.Caps; | 45 | using Caps = OpenSim.Region.Capabilities.Caps; |
46 | using Timer = System.Timers.Timer; | 46 | using Timer = System.Timers.Timer; |
47 | 47 | ||
48 | using OpenSim.Region.Environment.Parcels; | 48 | using OpenSim.Region.Environment.LandManagement; |
49 | 49 | ||
50 | namespace OpenSim.Region.Environment.Scenes | 50 | namespace OpenSim.Region.Environment.Scenes |
51 | { | 51 | { |
@@ -63,7 +63,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
63 | private uint _primCount = 702000; | 63 | private uint _primCount = 702000; |
64 | private System.Threading.Mutex _primAllocateMutex = new Mutex(false); | 64 | private System.Threading.Mutex _primAllocateMutex = new Mutex(false); |
65 | private int storageCount; | 65 | private int storageCount; |
66 | private int parcelPrimCheckCount; | 66 | private int landPrimCheckCount; |
67 | private Mutex updateLock; | 67 | private Mutex updateLock; |
68 | 68 | ||
69 | protected AuthenticateSessionsBase authenticateHandler; | 69 | protected AuthenticateSessionsBase authenticateHandler; |
@@ -146,7 +146,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
146 | m_scriptManager = new ScriptManager(this); | 146 | m_scriptManager = new ScriptManager(this); |
147 | m_eventManager = new EventManager(); | 147 | m_eventManager = new EventManager(); |
148 | 148 | ||
149 | m_eventManager.OnParcelPrimCountAdd += new EventManager.OnParcelPrimCountAddDelegate(m_LandManager.addPrimToParcelCounts); | 149 | m_eventManager.OnParcelPrimCountAdd += new EventManager.OnParcelPrimCountAddDelegate(m_LandManager.addPrimToLandPrimCounts); |
150 | 150 | ||
151 | MainLog.Instance.Verbose("World.cs - creating new entitities instance"); | 151 | MainLog.Instance.Verbose("World.cs - creating new entitities instance"); |
152 | Entities = new Dictionary<LLUUID, EntityBase>(); | 152 | Entities = new Dictionary<LLUUID, EntityBase>(); |
@@ -244,14 +244,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
244 | storageCount = 0; | 244 | storageCount = 0; |
245 | } | 245 | } |
246 | 246 | ||
247 | this.parcelPrimCheckCount++; | 247 | this.landPrimCheckCount++; |
248 | if (this.parcelPrimCheckCount > 50) //check every 5 seconds for tainted prims | 248 | if (this.landPrimCheckCount > 50) //check every 5 seconds for tainted prims |
249 | { | 249 | { |
250 | if (m_LandManager.parcelPrimCountTainted) | 250 | if (m_LandManager.landPrimCountTainted) |
251 | { | 251 | { |
252 | //Perform parcel update of prim count | 252 | //Perform land update of prim count |
253 | performParcelPrimCountUpdate(); | 253 | performParcelPrimCountUpdate(); |
254 | this.parcelPrimCheckCount = 0; | 254 | this.landPrimCheckCount = 0; |
255 | } | 255 | } |
256 | } | 256 | } |
257 | 257 | ||
@@ -513,7 +513,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
513 | { | 513 | { |
514 | if (this.Entities.ContainsKey(sceneObject.rootUUID)) | 514 | if (this.Entities.ContainsKey(sceneObject.rootUUID)) |
515 | { | 515 | { |
516 | m_LandManager.removePrimFromParcelCounts(sceneObject); | 516 | m_LandManager.removePrimFromLandPrimCounts(sceneObject); |
517 | this.Entities.Remove(sceneObject.rootUUID); | 517 | this.Entities.Remove(sceneObject.rootUUID); |
518 | m_LandManager.setPrimsTainted(); | 518 | m_LandManager.setPrimsTainted(); |
519 | } | 519 | } |
@@ -910,10 +910,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
910 | 910 | ||
911 | public void performParcelPrimCountUpdate() | 911 | public void performParcelPrimCountUpdate() |
912 | { | 912 | { |
913 | m_LandManager.resetAllParcelPrimCounts(); | 913 | m_LandManager.resetAllLandPrimCounts(); |
914 | m_eventManager.TriggerParcelPrimCountUpdate(); | 914 | m_eventManager.TriggerParcelPrimCountUpdate(); |
915 | m_LandManager.finalizeParcelPrimCountUpdate(); | 915 | m_LandManager.finalizeLandPrimCountUpdate(); |
916 | m_LandManager.parcelPrimCountTainted = false; | 916 | m_LandManager.landPrimCountTainted = false; |
917 | } | 917 | } |
918 | #endregion | 918 | #endregion |
919 | 919 | ||