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

Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge

avinationmerge
Melanie 2011-10-25 01:35:51 +01:00
parent b8352c153b c5826d589a
commit 0b833c458a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -3660,7 +3660,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary>
private void ResendPrimUpdates(List<EntityUpdate> updates, OutgoingPacket oPacket)
{
// m_log.WarnFormat("[CLIENT] resending prim update {0}",updates[0].UpdateTime);
// m_log.WarnFormat("[CLIENT] resending prim updates {0}, packet sequence number {1}", updates[0].UpdateTime, oPacket.SequenceNumber);
// Remove the update packet from the list of packets waiting for acknowledgement
// because we are requeuing the list of updates. They will be resent in new packets

5
OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
View File

@ -602,8 +602,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RTO = rto;
//m_log.Debug("[LLUDPCLIENT]: Setting agent " + this.Agent.FullName + "'s RTO to " + RTO + "ms with an RTTVAR of " +
// RTTVAR + " based on new RTT of " + r + "ms");
//if (RTO != rto)
// m_log.Debug("[LLUDPCLIENT]: Setting RTO to " + RTO + "ms from " + rto + "ms with an RTTVAR of " +
//RTTVAR + " based on new RTT of " + r + "ms");
}
/// <summary>

8
OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
View File

@ -164,6 +164,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
}
}
//if (expiredPackets != null)
// m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Found {0} expired packets on timeout of {1}", expiredPackets.Count, timeoutMS);
return expiredPackets;
}
@ -179,6 +182,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
PendingAck pendingAcknowledgement;
while (m_pendingAcknowledgements.TryDequeue(out pendingAcknowledgement))
{
//m_log.DebugFormat("[UNACKED PACKET COLLECTION]: Processing ack {0}", pendingAcknowledgement.SequenceNumber);
OutgoingPacket ackedPacket;
if (m_packets.TryGetValue(pendingAcknowledgement.SequenceNumber, out ackedPacket))
{
@ -201,6 +205,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ackedPacket.Client.UpdateRoundTrip(rtt);
}
}
else
{
//m_log.WarnFormat("[UNACKED PACKET COLLECTION]: Could not find packet with sequence number {0} to ack", pendingAcknowledgement.SequenceNumber);
}
}
}