2 files changed, 26 insertions, 0 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
index 664e23e..9dfe0e9 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
@@ -247,6 +247,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         //private UDPClientCollection m_clients = new UDPClientCollection();
         /// <summary>Bandwidth throttle for this UDP server</summary>
         protected TokenBucket m_throttle;
+
+        /// <summary>
+        /// Gets the maximum total drip rate allowed to all clients.
+        /// </summary>
+        public long MaxTotalDripRate { get { return m_throttle.RequestedDripRate; } }
         
         /// <summary>Bandwidth throttle rates for this UDP server</summary>
         public ThrottleRates ThrottleRates { get; private set; }
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index 5b23080..354a47d 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -48,6 +48,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         public void Register()
         {
             m_console.Commands.AddCommand(
+                "Comms", false, "show server throttles",
+                "show server throttles",
+                "Show information about server throttles",
+                HandleShowServerThrottlesCommand); 
+
+            m_console.Commands.AddCommand(
                 "Debug", false, "debug lludp packet",
                 "debug lludp packet [--default | --all] <level> [<avatar-first-name> <avatar-last-name>]",
                 "Turn on packet debugging.  This logs information when the client stack hands a processed packet off to downstream code or when upstream code first requests that a certain packet be sent.",
@@ -155,6 +161,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 HandleAgentUpdateCommand);
         }
 
+        private void HandleShowServerThrottlesCommand(string module, string[] args)
+        {
+            if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)
+                return;
+
+            m_console.OutputFormat("Throttles for {0}", m_udpServer.Scene.Name);
+            ConsoleDisplayList cdl = new ConsoleDisplayList();
+            cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled);
+            cdl.AddRow(
+                "Max scene throttle", 
+                m_udpServer.MaxTotalDripRate != 0 ? string.Format("{0} kbit", m_udpServer.MaxTotalDripRate / 8 / 1000) : "unset");
+
+            m_console.Output(cdl.ToString());
+        }
+
         private void HandleDataCommand(string module, string[] args)
         {
             if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene)