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

removed a redundant function; try to make a particular vi coder happy about removed comments

0.9.1.0-post-fixes
UbitUmarov 2019-02-25 23:05:11 +00:00
parent d01165818d
commit 91fab70236
2 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -859,17 +859,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
switch (category) switch (category)
{ {
case ThrottleOutPacketType.Land: case ThrottleOutPacketType.Land:
return ThrottleOutPacketTypeFlags.Land; return ThrottleOutPacketTypeFlags.Land; // Terrain data
case ThrottleOutPacketType.Wind: case ThrottleOutPacketType.Wind:
return ThrottleOutPacketTypeFlags.Wind; return ThrottleOutPacketTypeFlags.Wind; // Wind data
case ThrottleOutPacketType.Cloud: case ThrottleOutPacketType.Cloud:
return ThrottleOutPacketTypeFlags.Cloud; return ThrottleOutPacketTypeFlags.Cloud; // Cloud data
case ThrottleOutPacketType.Task: case ThrottleOutPacketType.Task:
return ThrottleOutPacketTypeFlags.Task; return ThrottleOutPacketTypeFlags.Task; // Object updates and everything not on the other categories
case ThrottleOutPacketType.Texture: case ThrottleOutPacketType.Texture:
return ThrottleOutPacketTypeFlags.Texture; return ThrottleOutPacketTypeFlags.Texture; // Textures data (also impacts http texture and mesh by default)
case ThrottleOutPacketType.Asset: case ThrottleOutPacketType.Asset:
return ThrottleOutPacketTypeFlags.Asset; return ThrottleOutPacketTypeFlags.Asset; // Non-texture Assets data
default: default:
return 0; return 0;
} }

18
OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
View File

@ -182,22 +182,6 @@ namespace OpenMetaverse
try { m_udpSocket.Close(); } catch { } try { m_udpSocket.Close(); } catch { }
} }
public UDPPacketBuffer GetNewUDPBuffer()
{
lock (m_udpBuffersPoolLock)
{
if (m_udpBuffersPoolPtr >= 0)
{
UDPPacketBuffer buf = m_udpBuffersPool[m_udpBuffersPoolPtr];
m_udpBuffersPool[m_udpBuffersPoolPtr] = null;
m_udpBuffersPoolPtr--;
buf.RemoteEndPoint = new IPEndPoint(IPAddress.Any, 0);
return buf;
}
}
return new UDPPacketBuffer(new IPEndPoint(IPAddress.Any, 0));
}
public UDPPacketBuffer GetNewUDPBuffer(IPEndPoint remoteEndpoint) public UDPPacketBuffer GetNewUDPBuffer(IPEndPoint remoteEndpoint)
{ {
lock (m_udpBuffersPoolLock) lock (m_udpBuffersPoolLock)
@ -353,7 +337,7 @@ namespace OpenMetaverse
if (!IsRunningInbound) if (!IsRunningInbound)
return; return;
UDPPacketBuffer buf = GetNewUDPBuffer(); UDPPacketBuffer buf = GetNewUDPBuffer(new IPEndPoint(IPAddress.Any, 0)); // we need a fresh one here, for now at least
try try
{ {
// kick off an async read // kick off an async read