From f57a48a0fbac53aebdb23da35b9412269e9c4f6c Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 10 Nov 2015 20:34:19 +0000 Subject: [PATCH] fix silly bug --- OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index 11d08ad603..5e35d95c0b 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain private void EventManager_TerrainCheckUpdatesAsync(object o) { // dont overlap execution - Monitor.TryEnter(TerrainCheckUpdatesLock); + if(Monitor.TryEnter(TerrainCheckUpdatesLock)) { // this needs fixing TerrainData terrData = m_channel.GetTerrainData(); @@ -1046,7 +1046,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain if(pups.Presence.IsDeleted) continue; - // throught acording to land queue free to send bytes + // limit rate acording to udp land queue state if (!pups.Presence.ControllingClient.CanSendLayerData()) continue; @@ -1098,7 +1098,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize; int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize; - if (pups.sendAllcurrentX > limitX && pups.sendAllcurrentY > limitY) + if (pups.sendAllcurrentX >= limitX && pups.sendAllcurrentY >= limitY) { pups.sendAll = false; pups.sendAllcurrentX = 0;