From 12ebc92e55efbe08616506d7f543c3c9ed88de43 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 13 Oct 2014 23:52:19 +0200
Subject: Revert "*TEST* send udp sync. Stop uncontroled and hidden use of IO
 threads."

This reverts commit 8c41271b3312f2a02608ffc41b220f7fb018d6ad.

Conflicts:

	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs   |  1 -
 .../Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs    | 18 +-----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 8cc009d..99e7aba 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -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;
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
index 1d76c14..881e768 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
@@ -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)
-- 
cgit v1.1