OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stop double counting dequeued packets for packets sent number 

This is already being incremented in LLUDPServer.SendPacketFinal for every packet
0.7.1-dev
Justin Clark-Casey (justincc) 2011-02-02 19:39:33 +00:00
parent 0898be5750
commit 2344150b6e
1 changed files with 5 additions and 4 deletions
OpenSim/Region/ClientStack/LindenUDP

9
OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
View File

@ -441,13 +441,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// an outgoing packet from each, obeying the throttling bucket limits /// an outgoing packet from each, obeying the throttling bucket limits
/// </summary> /// </summary>
/// ///
/// <remarks>
/// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower /// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower
/// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have /// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have
/// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the /// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the
/// wind queue). /// wind queue).
/// ///
/// <remarks>This function is only called from a synchronous loop in the /// This function is only called from a synchronous loop in the
/// UDPServer so we don't need to bother making this thread safe</remarks> /// UDPServer so we don't need to bother making this thread safe
/// </remarks>
///
/// <returns>True if any packets were sent, otherwise false</returns> /// <returns>True if any packets were sent, otherwise false</returns>
public bool DequeueOutgoing() public bool DequeueOutgoing()
{ {
@ -476,7 +479,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_udpServer.SendPacketFinal(nextPacket); m_udpServer.SendPacketFinal(nextPacket);
m_nextPackets[i] = null; m_nextPackets[i] = null;
packetSent = true; packetSent = true;
this.PacketsSent++;
} }
} }
else else
@ -493,7 +495,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Send the packet // Send the packet
m_udpServer.SendPacketFinal(packet); m_udpServer.SendPacketFinal(packet);
packetSent = true; packetSent = true;
this.PacketsSent++;
} }
else else
{ {