diff options
| author | Justin Clark-Casey (justincc) | 2014-10-07 00:08:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-11-25 23:18:40 +0000 |
| commit | 10d09e287c73f97856a8bb922ce1363f9dd0ec0c (patch) | |
| tree | fcecc558ea4b26f40f2ee9ef3ffcc484225154bc | |
| parent | Allow "debug lludp throttle *" commands to work without a user name, in which... (diff) | |
| download | opensim-SC_OLD-10d09e287c73f97856a8bb922ce1363f9dd0ec0c.zip opensim-SC_OLD-10d09e287c73f97856a8bb922ce1363f9dd0ec0c.tar.gz opensim-SC_OLD-10d09e287c73f97856a8bb922ce1363f9dd0ec0c.tar.bz2 opensim-SC_OLD-10d09e287c73f97856a8bb922ce1363f9dd0ec0c.tar.xz | |
Eliminate 'max' throttle setting from server throttles report since this never applies.
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs index 3dbd8ef..0d49879 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 | |||
| 193 | StringBuilder report = new StringBuilder(); | 193 | StringBuilder report = new StringBuilder(); |
| 194 | 194 | ||
| 195 | report.AppendFormat( | 195 | report.AppendFormat( |
| 196 | "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}\n", | 196 | "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n", |
| 197 | "Max", | ||
| 198 | "Total", | 197 | "Total", |
| 199 | "Resend", | 198 | "Resend", |
| 200 | "Land", | 199 | "Land", |
| @@ -205,7 +204,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 205 | "Asset"); | 204 | "Asset"); |
| 206 | 205 | ||
| 207 | report.AppendFormat( | 206 | report.AppendFormat( |
| 208 | "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}\n", | 207 | "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}\n", |
| 209 | "kb/s", | 208 | "kb/s", |
| 210 | "kb/s", | 209 | "kb/s", |
| 211 | "kb/s", | 210 | "kb/s", |
| @@ -213,15 +212,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 213 | "kb/s", | 212 | "kb/s", |
| 214 | "kb/s", | 213 | "kb/s", |
| 215 | "kb/s", | 214 | "kb/s", |
| 216 | "kb/s", | 215 | "kb/s"); |
| 217 | "kb/s"); | ||
| 218 | |||
| 219 | report.AppendLine(); | ||
| 220 | 216 | ||
| 221 | ThrottleRates throttleRates = udpServer.ThrottleRates; | 217 | ThrottleRates throttleRates = udpServer.ThrottleRates; |
| 222 | report.AppendFormat( | 218 | report.AppendFormat( |
| 223 | "{0,8} {1,7} {2,8} {3,7} {4,7} {5,7} {6,7} {7,9} {8,7}", | 219 | "{0,7} {1,8} {2,7} {3,7} {4,7} {5,7} {6,9} {7,7}", |
| 224 | "-", | ||
| 225 | (throttleRates.Total * 8) / 1000, | 220 | (throttleRates.Total * 8) / 1000, |
| 226 | (throttleRates.Resend * 8) / 1000, | 221 | (throttleRates.Resend * 8) / 1000, |
| 227 | (throttleRates.Land * 8) / 1000, | 222 | (throttleRates.Land * 8) / 1000, |