Fix recent regression where adaptive throttles stopped adjusting.

Extends regression tests to test response of adaptive throttles to ack'ed and expired packets.

1 files changed, 16 insertions, 18 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
index c768662..b70d861 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs
@@ -447,31 +447,29 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 long total = resend + land + wind + cloud + task + texture + asset;
                 m_throttleClient.TargetDripRate = total;
             }
-            else
-            {
-                TokenBucket bucket;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
-                bucket.RequestedDripRate = resend;
+            TokenBucket bucket;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land];
-                bucket.RequestedDripRate = land;
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Resend];
+            bucket.RequestedDripRate = resend;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind];
-                bucket.RequestedDripRate = wind;
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Land];
+            bucket.RequestedDripRate = land;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud];
-                bucket.RequestedDripRate = cloud;
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Wind];
+            bucket.RequestedDripRate = wind;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset];
-                bucket.RequestedDripRate = asset;
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Cloud];
+            bucket.RequestedDripRate = cloud;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
-                bucket.RequestedDripRate = task;
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Asset];
+            bucket.RequestedDripRate = asset;
 
-                bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
-                bucket.RequestedDripRate = texture;
-            }
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Task];
+            bucket.RequestedDripRate = task;
+
+            bucket = m_throttleCategories[(int)ThrottleOutPacketType.Texture];
+            bucket.RequestedDripRate = texture;
 
             // Reset the packed throttles cached data
             m_packedThrottles = null;