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

fix silly bug

avinationmerge
UbitUmarov 2015-11-10 20:34:19 +00:00
parent 5bfd49404d
commit f57a48a0fb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@ -804,7 +804,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private void EventManager_TerrainCheckUpdatesAsync(object o) private void EventManager_TerrainCheckUpdatesAsync(object o)
{ {
// dont overlap execution // dont overlap execution
Monitor.TryEnter(TerrainCheckUpdatesLock); if(Monitor.TryEnter(TerrainCheckUpdatesLock))
{ {
// this needs fixing // this needs fixing
TerrainData terrData = m_channel.GetTerrainData(); TerrainData terrData = m_channel.GetTerrainData();
@ -1046,7 +1046,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
if(pups.Presence.IsDeleted) if(pups.Presence.IsDeleted)
continue; continue;
// throught acording to land queue free to send bytes // limit rate acording to udp land queue state
if (!pups.Presence.ControllingClient.CanSendLayerData()) if (!pups.Presence.ControllingClient.CanSendLayerData())
continue; continue;
@ -1098,7 +1098,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize; int limitX = (int)m_scene.RegionInfo.RegionSizeX / Constants.TerrainPatchSize;
int limitY = (int)m_scene.RegionInfo.RegionSizeY / 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.sendAll = false;
pups.sendAllcurrentX = 0; pups.sendAllcurrentX = 0;