Revert "*TEST* send udp sync. Stop uncontroled and hidden use of IO threads."

This reverts commit 8c41271b33.

Conflicts:

	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
avinationmerge
Melanie Thielker 2014-10-13 23:52:19 +02:00
parent 32468bebef
commit 12ebc92e55
2 changed files with 1 additions and 18 deletions

View File

@ -1306,7 +1306,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Put the UDP payload on the wire
AsyncBeginSend(buffer);
//SyncSend(buffer);
// Keep track of when this packet was sent out (right now)
outgoingPacket.TickCount = Environment.TickCount & Int32.MaxValue;

View File

@ -375,28 +375,12 @@ namespace OpenMetaverse
// Synchronous mode waits until the packet callback completes
// before starting the receive to fetch another packet
// if (!m_asyncPacketHandling)
if (!m_asyncPacketHandling)
AsyncBeginReceive();
}
}
}
public void SyncSend(UDPPacketBuffer buf)
{
try
{
m_udpSocket.SendTo(
buf.Data,
0,
buf.DataLength,
SocketFlags.None,
buf.RemoteEndPoint
);
}
catch (SocketException) { }
catch (ObjectDisposedException) { }
}
public void AsyncBeginSend(UDPPacketBuffer buf)
{
// if (IsRunningOutbound)