From 473fac4dc71858139bd44c1e9ce4fd03d9d1bd91 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Wed, 9 Feb 2011 08:06:20 -0800
Subject: Detect negative dripAmounts in TokenBuckets. These negatives result
 from overflown integer operations. Also added Total to the scene throttles 
 in show throttles.

---
 OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs                    | 3 +++
 OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
index bdbd284..dd52683 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/TokenBucket.cs
@@ -207,6 +207,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 int dripAmount = deltaMS * tokensPerMS;
 
+                if (dripAmount < 0)
+                    Console.WriteLine("MAY DAY MAY DAY! Drip amount is " + dripAmount + ". This should not happen");
+
                 content = Math.Min(content + dripAmount, maxBurst);
                 lastDrip = now;
 
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 53cebb2..dfeecb1 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
             ThrottleRates throttleRates = udpServer.ThrottleRates;
             report.AppendFormat(
                 "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}",
-                "n/a",
+                (throttleRates.Total * 8) / 1000,
                 (throttleRates.ResendLimit * 8) / 1000,
                 (throttleRates.LandLimit * 8) / 1000,
                 (throttleRates.WindLimit * 8) / 1000,
-- 
cgit v1.1