aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-14 03:49:54 +0100
committerJustin Clark-Casey (justincc)2012-06-14 03:49:54 +0100
commit2c6555021fdcf5dcd08a19d41412acf20f514b14 (patch)
tree010005c2ff61917671f97afb8fb3e5e93b091632
parentIf we're going to discard a terse update block because it's now someone else'... (diff)
downloadopensim-SC_OLD-2c6555021fdcf5dcd08a19d41412acf20f514b14.zip
opensim-SC_OLD-2c6555021fdcf5dcd08a19d41412acf20f514b14.tar.gz
opensim-SC_OLD-2c6555021fdcf5dcd08a19d41412acf20f514b14.tar.bz2
opensim-SC_OLD-2c6555021fdcf5dcd08a19d41412acf20f514b14.tar.xz
Fix very recent regression in 917d753 where I put the ++updatesThisCall outside the batching part of ProcessEntityUpdates()
This stopped any batching happening and since this method is called periodically updates were sent very slowly
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 4ea977e..4cb7a3a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3848,6 +3848,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3848 terseUpdates.Value.Add(update); 3848 terseUpdates.Value.Add(update);
3849 } 3849 }
3850 } 3850 }
3851
3852 ++updatesThisCall;
3851 3853
3852 #endregion Block Construction 3854 #endregion Block Construction
3853 } 3855 }
@@ -3914,8 +3916,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3914 // If any of the packets created from this call go unacknowledged, all of the updates will be resent 3916 // If any of the packets created from this call go unacknowledged, all of the updates will be resent
3915 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); }); 3917 OutPacket(packet, ThrottleOutPacketType.Task, true, delegate(OutgoingPacket oPacket) { ResendPrimUpdates(terseUpdates.Value, oPacket); });
3916 } 3918 }
3917
3918 ++updatesThisCall;
3919 } 3919 }
3920 3920
3921 #endregion Packet Sending 3921 #endregion Packet Sending