aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs12
-rwxr-xr-xOpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs16
2 files changed, 9 insertions, 19 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 62f0b32..9e0c783 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5149,7 +5149,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5149 buf.DataLength = lastpos; 5149 buf.DataLength = lastpos;
5150 5150
5151 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 5151 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
5152 delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false); 5152 //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
5153 null, false, false);
5153 5154
5154 buf = newbuf; 5155 buf = newbuf;
5155 zc.Data = buf.Data; 5156 zc.Data = buf.Data;
@@ -5173,7 +5174,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5173 buf.Data[countposition] = (byte)count; 5174 buf.Data[countposition] = (byte)count;
5174 buf.DataLength = zc.Finish(); 5175 buf.DataLength = zc.Finish();
5175 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 5176 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
5176 delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false); 5177 //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
5178 null, false, false);
5177 } 5179 }
5178 } 5180 }
5179 5181
@@ -5296,7 +5298,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5296 buf.DataLength = lastpos; 5298 buf.DataLength = lastpos;
5297 5299
5298 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 5300 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
5299 delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false); 5301 //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
5302 null, false, false);
5300 5303
5301 buf = newbuf; 5304 buf = newbuf;
5302 zc.Data = buf.Data; 5305 zc.Data = buf.Data;
@@ -5319,7 +5322,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5319 buf.Data[countposition] = (byte)count; 5322 buf.Data[countposition] = (byte)count;
5320 buf.DataLength = zc.Finish(); 5323 buf.DataLength = zc.Finish();
5321 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 5324 m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
5322 delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false); 5325 //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
5326 null, false, false);
5323 } 5327 }
5324 } 5328 }
5325 5329
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 19535dc..3817830 100755
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -229,11 +229,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
229 StatVerbosity.Debug)); 229 StatVerbosity.Debug));
230 } 230 }
231 231
232 public virtual bool HandlesRegion(Location x)
233 {
234 return m_udpServer.HandlesRegion(x);
235 }
236
237 public virtual void Start() 232 public virtual void Start()
238 { 233 {
239 m_udpServer.Start(); 234 m_udpServer.Start();
@@ -256,7 +251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
256 251
257 /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary> 252 /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary>
258 public const int MTU = 1400; 253 public const int MTU = 1400;
259 public const int MAXPAYLOAD = 1250; 254 public const int MAXPAYLOAD = 1200;
260 255
261 /// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary> 256 /// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary>
262 public int ClientLogoutsDueToNoReceives { get; protected set; } 257 public int ClientLogoutsDueToNoReceives { get; protected set; }
@@ -298,9 +293,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
298 /// <summary>Reference to the scene this UDP server is attached to</summary> 293 /// <summary>Reference to the scene this UDP server is attached to</summary>
299 public Scene Scene { get; protected set; } 294 public Scene Scene { get; protected set; }
300 295
301 /// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
302 protected Location m_location;
303
304 /// <summary>The size of the receive buffer for the UDP socket. This value 296 /// <summary>The size of the receive buffer for the UDP socket. This value
305 /// is passed up to the operating system and used in the system networking 297 /// is passed up to the operating system and used in the system networking
306 /// stack. Use zero to leave this value as the default</summary> 298 /// stack. Use zero to leave this value as the default</summary>
@@ -545,7 +537,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
545 } 537 }
546 538
547 Scene = (Scene)scene; 539 Scene = (Scene)scene;
548 m_location = new Location(Scene.RegionInfo.RegionHandle);
549 540
550 OqrEngine = new JobEngine( 541 OqrEngine = new JobEngine(
551 string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name), 542 string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name),
@@ -673,11 +664,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
673 commands.Register(); 664 commands.Register();
674 } 665 }
675 666
676 public bool HandlesRegion(Location x)
677 {
678 return x == m_location;
679 }
680
681 public int GetTotalQueuedOutgoingPackets() 667 public int GetTotalQueuedOutgoingPackets()
682 { 668 {
683 int total = 0; 669 int total = 0;