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

slow down terrain sending so other users of LAND queue do have a chance to send things

avinationmerge
UbitUmarov 2015-09-24 00:35:06 +01:00
parent e441c9cac1
commit 8fde2fb901
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -1210,7 +1210,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public virtual bool CanSendLayerData() public virtual bool CanSendLayerData()
{ {
int n = m_udpClient.GetPacketsQueuedCount(ThrottleOutPacketType.Land); int n = m_udpClient.GetPacketsQueuedCount(ThrottleOutPacketType.Land);
if ( n > 256) if ( n > 20)
return false; return false;
return true; return true;
} }

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

@ -1102,7 +1102,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{ {
pups.SetByPatch(x, y, false); pups.SetByPatch(x, y, false);
patchs.Add(new PatchesToSend(x, y, 0)); patchs.Add(new PatchesToSend(x, y, 0));
if (++npatchs >= 512) if (++npatchs >= 128)
{ {
pups.sendAllcurrentX = x + 1; pups.sendAllcurrentX = x + 1;
pups.sendAllcurrentY = y; pups.sendAllcurrentY = y;
@ -1110,7 +1110,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
} }
} }
} }
if (npatchs >= 512) if (npatchs >= 128)
break; break;
x = 0; x = 0;
} }
@ -1221,7 +1221,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
{ {
pups.SetByPatch(x, y, false); pups.SetByPatch(x, y, false);
ret.Add(new PatchesToSend(x, y, (float)distsq)); ret.Add(new PatchesToSend(x, y, (float)distsq));
if (npatchs++ > 1024) if (npatchs++ > 512)
{ {
y = endY; y = endY;
x = endX; x = endX;