aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-09-24 00:35:06 +0100
committerUbitUmarov2015-09-24 00:35:06 +0100
commit8fde2fb901bbb017b56e3be2f10655fbb0d88b5b (patch)
treef9f0243fca8a03033845996368e80790c4c14ffb /OpenSim
parent dont let http keepalive and context reuse be true (diff)
downloadopensim-SC_OLD-8fde2fb901bbb017b56e3be2f10655fbb0d88b5b.zip
opensim-SC_OLD-8fde2fb901bbb017b56e3be2f10655fbb0d88b5b.tar.gz
opensim-SC_OLD-8fde2fb901bbb017b56e3be2f10655fbb0d88b5b.tar.bz2
opensim-SC_OLD-8fde2fb901bbb017b56e3be2f10655fbb0d88b5b.tar.xz
slow down terrain sending so other users of LAND queue do have a chance to send things
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs6
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 dbe85d0..5ca96f2 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
1210 public virtual bool CanSendLayerData() 1210 public virtual bool CanSendLayerData()
1211 { 1211 {
1212 int n = m_udpClient.GetPacketsQueuedCount(ThrottleOutPacketType.Land); 1212 int n = m_udpClient.GetPacketsQueuedCount(ThrottleOutPacketType.Land);
1213 if ( n > 256) 1213 if ( n > 20)
1214 return false; 1214 return false;
1215 return true; 1215 return true;
1216 } 1216 }
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
index 2f4618d..e441979 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
1102 { 1102 {
1103 pups.SetByPatch(x, y, false); 1103 pups.SetByPatch(x, y, false);
1104 patchs.Add(new PatchesToSend(x, y, 0)); 1104 patchs.Add(new PatchesToSend(x, y, 0));
1105 if (++npatchs >= 512) 1105 if (++npatchs >= 128)
1106 { 1106 {
1107 pups.sendAllcurrentX = x + 1; 1107 pups.sendAllcurrentX = x + 1;
1108 pups.sendAllcurrentY = y; 1108 pups.sendAllcurrentY = y;
@@ -1110,7 +1110,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1110 } 1110 }
1111 } 1111 }
1112 } 1112 }
1113 if (npatchs >= 512) 1113 if (npatchs >= 128)
1114 break; 1114 break;
1115 x = 0; 1115 x = 0;
1116 } 1116 }
@@ -1221,7 +1221,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
1221 { 1221 {
1222 pups.SetByPatch(x, y, false); 1222 pups.SetByPatch(x, y, false);
1223 ret.Add(new PatchesToSend(x, y, (float)distsq)); 1223 ret.Add(new PatchesToSend(x, y, (float)distsq));
1224 if (npatchs++ > 1024) 1224 if (npatchs++ > 512)
1225 { 1225 {
1226 y = endY; 1226 y = endY;
1227 x = endX; 1227 x = endX;