diff options
author | Justin Clark-Casey (justincc) | 2014-10-07 01:08:22 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2014-11-25 23:18:40 +0000 |
commit | d20aeefef2abc422a5ab6fc3ad229f49a9a437c3 (patch) | |
tree | 8a606767f3983d3d2ce6efd2a0517797dbbdb8e0 /OpenSim/Region | |
parent | Eliminate 'max' throttle setting from server throttles report since this neve... (diff) | |
download | opensim-SC-d20aeefef2abc422a5ab6fc3ad229f49a9a437c3.zip opensim-SC-d20aeefef2abc422a5ab6fc3ad229f49a9a437c3.tar.gz opensim-SC-d20aeefef2abc422a5ab6fc3ad229f49a9a437c3.tar.bz2 opensim-SC-d20aeefef2abc422a5ab6fc3ad229f49a9a437c3.tar.xz |
Fix console set and get of max scene rate. Was performing wrong calculation - throttle buckets are set in bytes, not bits
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs index 0d49879..20ae188 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | |||
@@ -159,7 +159,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
159 | "debug lludp set", | 159 | "debug lludp set", |
160 | "debug lludp set <param> <value>", | 160 | "debug lludp set <param> <value>", |
161 | "Set a parameter for the server.", | 161 | "Set a parameter for the server.", |
162 | "Only current setting is 'scene-throttle-max' which sets the current max cumulative kbit/s provided for this scene to clients", | 162 | "Only current setting is 'scene-throttle-max' which sets the current max cumulative kbps provided for this scene to clients", |
163 | HandleSetCommand); | 163 | HandleSetCommand); |
164 | 164 | ||
165 | m_console.Commands.AddCommand( | 165 | m_console.Commands.AddCommand( |
@@ -181,7 +181,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
181 | cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); | 181 | cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); |
182 | cdl.AddRow( | 182 | cdl.AddRow( |
183 | "Max scene throttle", | 183 | "Max scene throttle", |
184 | m_udpServer.MaxTotalDripRate != 0 ? string.Format("{0} kbit", m_udpServer.MaxTotalDripRate / 8 / 1000) : "unset"); | 184 | m_udpServer.MaxTotalDripRate != 0 ? string.Format("{0} kbps", m_udpServer.MaxTotalDripRate * 8 / 1000) : "unset"); |
185 | 185 | ||
186 | m_console.Output(cdl.ToString()); | 186 | m_console.Output(cdl.ToString()); |
187 | 187 | ||
@@ -418,7 +418,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
418 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) | 418 | if (!ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, rawValue, out newValue)) |
419 | return; | 419 | return; |
420 | 420 | ||
421 | m_udpServer.Throttle.RequestedDripRate = newValue * 8 * 1000; | 421 | m_udpServer.Throttle.RequestedDripRate = newValue * 1000 / 8; |
422 | } | 422 | } |
423 | 423 | ||
424 | m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name); | 424 | m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name); |