aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie Thielker2014-10-13 23:52:19 +0200
committerMelanie Thielker2014-10-13 23:52:19 +0200
commit12ebc92e55efbe08616506d7f543c3c9ed88de43 (patch)
treef057ff0c740455e762e949bef7df32bd8fd49ebc /OpenSim
parentMerge branch 'ubitworkmaster' (diff)
downloadopensim-SC_OLD-12ebc92e55efbe08616506d7f543c3c9ed88de43.zip
opensim-SC_OLD-12ebc92e55efbe08616506d7f543c3c9ed88de43.tar.gz
opensim-SC_OLD-12ebc92e55efbe08616506d7f543c3c9ed88de43.tar.bz2
opensim-SC_OLD-12ebc92e55efbe08616506d7f543c3c9ed88de43.tar.xz
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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs1
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs18
2 files changed, 1 insertions, 18 deletions
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
1306 1306
1307 // Put the UDP payload on the wire 1307 // Put the UDP payload on the wire
1308 AsyncBeginSend(buffer); 1308 AsyncBeginSend(buffer);
1309 //SyncSend(buffer);
1310 1309
1311 // Keep track of when this packet was sent out (right now) 1310 // Keep track of when this packet was sent out (right now)
1312 outgoingPacket.TickCount = Environment.TickCount & Int32.MaxValue; 1311 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
375 375
376 // Synchronous mode waits until the packet callback completes 376 // Synchronous mode waits until the packet callback completes
377 // before starting the receive to fetch another packet 377 // before starting the receive to fetch another packet
378// if (!m_asyncPacketHandling) 378 if (!m_asyncPacketHandling)
379 AsyncBeginReceive(); 379 AsyncBeginReceive();
380 } 380 }
381 } 381 }
382 } 382 }
383 383
384 public void SyncSend(UDPPacketBuffer buf)
385 {
386 try
387 {
388 m_udpSocket.SendTo(
389 buf.Data,
390 0,
391 buf.DataLength,
392 SocketFlags.None,
393 buf.RemoteEndPoint
394 );
395 }
396 catch (SocketException) { }
397 catch (ObjectDisposedException) { }
398 }
399
400 public void AsyncBeginSend(UDPPacketBuffer buf) 384 public void AsyncBeginSend(UDPPacketBuffer buf)
401 { 385 {
402// if (IsRunningOutbound) 386// if (IsRunningOutbound)