diff options
| author | Mic Bowman | 2011-04-21 15:41:15 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-04-21 15:41:15 -0700 |
| commit | 0897647709449c3622432dc88f1b48e973126ad0 (patch) | |
| tree | 828c4447857ed3b8be5be7dd5e0754fbbfc32ac4 /OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |
| parent | Add some locking on the child list for the token bucket (diff) | |
| parent | Refactor UnackedPacketCollection so ProcessQueues will handle Adds, Acks, and... (diff) | |
| download | opensim-SC-0897647709449c3622432dc88f1b48e973126ad0.zip opensim-SC-0897647709449c3622432dc88f1b48e973126ad0.tar.gz opensim-SC-0897647709449c3622432dc88f1b48e973126ad0.tar.bz2 opensim-SC-0897647709449c3622432dc88f1b48e973126ad0.tar.xz | |
Merge branch 'queuetest' of ssh://opensimulator.org/var/git/opensim into queuetest
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index bd58ddc..aff90c5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
| @@ -672,7 +672,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 672 | if (packet.Header.AppendedAcks && packet.Header.AckList != null) | 672 | if (packet.Header.AppendedAcks && packet.Header.AckList != null) |
| 673 | { | 673 | { |
| 674 | for (int i = 0; i < packet.Header.AckList.Length; i++) | 674 | for (int i = 0; i < packet.Header.AckList.Length; i++) |
| 675 | udpClient.NeedAcks.Remove(packet.Header.AckList[i], now, packet.Header.Resent); | 675 | udpClient.NeedAcks.Acknowledge(packet.Header.AckList[i], now, packet.Header.Resent); |
| 676 | } | 676 | } |
| 677 | 677 | ||
| 678 | // Handle PacketAck packets | 678 | // Handle PacketAck packets |
| @@ -681,7 +681,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 681 | PacketAckPacket ackPacket = (PacketAckPacket)packet; | 681 | PacketAckPacket ackPacket = (PacketAckPacket)packet; |
| 682 | 682 | ||
| 683 | for (int i = 0; i < ackPacket.Packets.Length; i++) | 683 | for (int i = 0; i < ackPacket.Packets.Length; i++) |
| 684 | udpClient.NeedAcks.Remove(ackPacket.Packets[i].ID, now, packet.Header.Resent); | 684 | udpClient.NeedAcks.Acknowledge(ackPacket.Packets[i].ID, now, packet.Header.Resent); |
| 685 | 685 | ||
| 686 | // We don't need to do anything else with PacketAck packets | 686 | // We don't need to do anything else with PacketAck packets |
| 687 | return; | 687 | return; |