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

testing ...

0.9.1.0-post-fixes
UbitUmarov 2019-04-09 00:25:38 +01:00
parent cadcf412ec
commit 2c8e03b589
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5149,7 +5149,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.DataLength = lastpos; buf.DataLength = lastpos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 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; buf = newbuf;
zc.Data = buf.Data; zc.Data = buf.Data;
@ -5173,7 +5174,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.Data[countposition] = (byte)count; buf.Data[countposition] = (byte)count;
buf.DataLength = zc.Finish(); buf.DataLength = zc.Finish();
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 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; buf.DataLength = lastpos;
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 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; buf = newbuf;
zc.Data = buf.Data; zc.Data = buf.Data;
@ -5319,7 +5322,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
buf.Data[countposition] = (byte)count; buf.Data[countposition] = (byte)count;
buf.DataLength = zc.Finish(); buf.DataLength = zc.Finish();
m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, 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);
} }
} }

16
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -229,11 +229,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
StatVerbosity.Debug)); StatVerbosity.Debug));
} }
public virtual bool HandlesRegion(Location x)
{
return m_udpServer.HandlesRegion(x);
}
public virtual void Start() public virtual void Start()
{ {
m_udpServer.Start(); m_udpServer.Start();
@ -256,7 +251,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary> /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary>
public const int MTU = 1400; public const int MTU = 1400;
public const int MAXPAYLOAD = 1250; public const int MAXPAYLOAD = 1200;
/// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary> /// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary>
public int ClientLogoutsDueToNoReceives { get; protected set; } public int ClientLogoutsDueToNoReceives { get; protected set; }
@ -298,9 +293,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary>Reference to the scene this UDP server is attached to</summary> /// <summary>Reference to the scene this UDP server is attached to</summary>
public Scene Scene { get; protected set; } public Scene Scene { get; protected set; }
/// <summary>The X/Y coordinates of the scene this UDP server is attached to</summary>
protected Location m_location;
/// <summary>The size of the receive buffer for the UDP socket. This value /// <summary>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 /// is passed up to the operating system and used in the system networking
/// stack. Use zero to leave this value as the default</summary> /// stack. Use zero to leave this value as the default</summary>
@ -545,7 +537,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
} }
Scene = (Scene)scene; Scene = (Scene)scene;
m_location = new Location(Scene.RegionInfo.RegionHandle);
OqrEngine = new JobEngine( OqrEngine = new JobEngine(
string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name), string.Format("Outgoing Queue Refill Engine ({0})", Scene.Name),
@ -673,11 +664,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
commands.Register(); commands.Register();
} }
public bool HandlesRegion(Location x)
{
return x == m_location;
}
public int GetTotalQueuedOutgoingPackets() public int GetTotalQueuedOutgoingPackets()
{ {
int total = 0; int total = 0;