From 2c8e03b589585c1d4b19368f30ccf2806f09cafb Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 9 Apr 2019 00:25:38 +0100
Subject: testing ...
---
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 12 ++++++++----
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 16 +---------------
2 files changed, 9 insertions(+), 19 deletions(-)
(limited to 'OpenSim/Region')
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
buf.DataLength = lastpos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
- delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ null, false, false);
buf = newbuf;
zc.Data = buf.Data;
@@ -5173,7 +5174,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.Data[countposition] = (byte)count;
buf.DataLength = zc.Finish();
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
- delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ null, false, false);
}
}
@@ -5296,7 +5298,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.DataLength = lastpos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
- delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ null, false, false);
buf = newbuf;
zc.Data = buf.Data;
@@ -5319,7 +5322,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.Data[countposition] = (byte)count;
buf.DataLength = zc.Finish();
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task,
- delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ //delegate (OutgoingPacket oPacket) { ResendPrimUpdates(tau, oPacket); }, false, false);
+ null, false, false);
}
}
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
StatVerbosity.Debug));
}
- public virtual bool HandlesRegion(Location x)
- {
- return m_udpServer.HandlesRegion(x);
- }
-
public virtual void Start()
{
m_udpServer.Start();
@@ -256,7 +251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Maximum transmission unit, or UDP packet size, for the LLUDP protocol
public const int MTU = 1400;
- public const int MAXPAYLOAD = 1250;
+ public const int MAXPAYLOAD = 1200;
/// Number of forced client logouts due to no receipt of packets before timeout.
public int ClientLogoutsDueToNoReceives { get; protected set; }
@@ -298,9 +293,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// Reference to the scene this UDP server is attached to
public Scene Scene { get; protected set; }
- /// The X/Y coordinates of the scene this UDP server is attached to
- protected Location m_location;
-
/// The size of the receive buffer for the UDP socket. This value
/// is passed up to the operating system and used in the system networking
/// stack. Use zero to leave this value as the default
@@ -545,7 +537,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
Scene = (Scene)scene;
- m_location = new Location(Scene.RegionInfo.RegionHandle);
OqrEngine = new JobEngine(
string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name),
@@ -673,11 +664,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
commands.Register();
}
- public bool HandlesRegion(Location x)
- {
- return x == m_location;
- }
-
public int GetTotalQueuedOutgoingPackets()
{
int total = 0;
--
cgit v1.1