From 7ca4e2cb6fe1ff2dd722609dbaaa94ec953b0343 Mon Sep 17 00:00:00 2001 From: "Justin Clark-Casey (justincc)" Date: Tue, 7 Oct 2014 00:08:44 +0100 Subject: [PATCH] Eliminate 'max' throttle setting from server throttles report since this never applies. --- .../ClientStack/Linden/UDP/LLUDPServerCommands.cs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs index 3dbd8ef6fd..0d498794e0 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs @@ -193,8 +193,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP StringBuilder report = new StringBuilder(); report.AppendFormat( - "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}\n", - "Max", + "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n", "Total", "Resend", "Land", @@ -205,7 +204,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP "Asset"); report.AppendFormat( - "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}\n", + "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n", "kb/s", "kb/s", "kb/s", @@ -213,15 +212,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP "kb/s", "kb/s", "kb/s", - "kb/s", - "kb/s"); - - report.AppendLine(); + "kb/s"); ThrottleRates throttleRates = udpServer.ThrottleRates; report.AppendFormat( - "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}", - "-", + "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}", (throttleRates.Total * 8) / 1000, (throttleRates.Resend * 8) / 1000, (throttleRates.Land * 8) / 1000,