From 8fde2fb901bbb017b56e3be2f10655fbb0d88b5b Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Thu, 24 Sep 2015 00:35:06 +0100 Subject: [PATCH] slow down terrain sending so other users of LAND queue do have a chance to send things --- OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 +- OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index dbe85d0109..5ca96f27d3 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -1210,7 +1210,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public virtual bool CanSendLayerData() { int n = m_udpClient.GetPacketsQueuedCount(ThrottleOutPacketType.Land); - if ( n > 256) + if ( n > 20) return false; return true; } diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index 2f4618dfab..e441979975 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs @@ -1102,7 +1102,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain { pups.SetByPatch(x, y, false); patchs.Add(new PatchesToSend(x, y, 0)); - if (++npatchs >= 512) + if (++npatchs >= 128) { pups.sendAllcurrentX = x + 1; pups.sendAllcurrentY = y; @@ -1110,7 +1110,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain } } } - if (npatchs >= 512) + if (npatchs >= 128) break; x = 0; } @@ -1221,7 +1221,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain { pups.SetByPatch(x, y, false); ret.Add(new PatchesToSend(x, y, (float)distsq)); - if (npatchs++ > 1024) + if (npatchs++ > 512) { y = endY; x = endX;