diff options
| author | Melanie Thielker | 2014-10-13 23:52:19 +0200 |
|---|---|---|
| committer | Melanie Thielker | 2014-10-13 23:52:19 +0200 |
| commit | 12ebc92e55efbe08616506d7f543c3c9ed88de43 (patch) | |
| tree | f057ff0c740455e762e949bef7df32bd8fd49ebc /OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |
| parent | Merge branch 'ubitworkmaster' (diff) | |
| download | opensim-SC-12ebc92e55efbe08616506d7f543c3c9ed88de43.zip opensim-SC-12ebc92e55efbe08616506d7f543c3c9ed88de43.tar.gz opensim-SC-12ebc92e55efbe08616506d7f543c3c9ed88de43.tar.bz2 opensim-SC-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/Region/ClientStack/Linden/UDP/LLUDPServer.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 1 |
1 files changed, 0 insertions, 1 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; |