aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2015-11-10 20:34:19 +0000
committerUbitUmarov2015-11-10 20:34:19 +0000
commitf57a48a0fbac53aebdb23da35b9412269e9c4f6c (patch)
tree2fba0c41ced6ba8910e76495bbfeef1b4d3eaeb4
parent start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on... (diff)
downloadopensim-SC-f57a48a0fbac53aebdb23da35b9412269e9c4f6c.zip
opensim-SC-f57a48a0fbac53aebdb23da35b9412269e9c4f6c.tar.gz
opensim-SC-f57a48a0fbac53aebdb23da35b9412269e9c4f6c.tar.bz2
opensim-SC-f57a48a0fbac53aebdb23da35b9412269e9c4f6c.tar.xz
fix silly bug
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 11d08ad..5e35d95 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
804 private void EventManager_TerrainCheckUpdatesAsync(object o) 804 private void EventManager_TerrainCheckUpdatesAsync(object o)
805 { 805 {
806 // dont overlap execution 806 // dont overlap execution
807 Monitor.TryEnter(TerrainCheckUpdatesLock); 807 if(Monitor.TryEnter(TerrainCheckUpdatesLock))
808 { 808 {
809 // this needs fixing 809 // this needs fixing
810 TerrainData terrData = m_channel.GetTerrainData(); 810 TerrainData terrData = m_channel.GetTerrainData();
@@ -1046,7 +1046,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1046 if(pups.Presence.IsDeleted) 1046 if(pups.Presence.IsDeleted)
1047 continue; 1047 continue;
1048 1048
1049 // throught acording to land queue free to send bytes 1049 // limit rate acording to udp land queue state
1050 if (!pups.Presence.ControllingClient.CanSendLayerData()) 1050 if (!pups.Presence.ControllingClient.CanSendLayerData())
1051 continue; 1051 continue;
1052 1052
@@ -1098,7 +1098,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1098 int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize; 1098 int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
1099 int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize; 1099 int limitY = (int)m_scene.RegionInfo.RegionSizeY / Constants.TerrainPatchSize;
1100 1100
1101 if (pups.sendAllcurrentX > limitX && pups.sendAllcurrentY > limitY) 1101 if (pups.sendAllcurrentX >= limitX && pups.sendAllcurrentY >= limitY)
1102 { 1102 {
1103 pups.sendAll = false; 1103 pups.sendAll = false;
1104 pups.sendAllcurrentX = 0; 1104 pups.sendAllcurrentX = 0;