aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-10-08 00:31:35 +0100
committerJustin Clark-Casey (justincc)2014-11-25 23:18:40 +0000
commita13022c296d8395a8ec20bdd61a8b8041d3bfd93 (patch)
tree40393b8746b6a94fe45e2e7e0e2776510a0fdeed
parentAdd throttle-max option to "debug lludp throttles set" to allow runtime setti... (diff)
downloadopensim-SC_OLD-a13022c296d8395a8ec20bdd61a8b8041d3bfd93.zip
opensim-SC_OLD-a13022c296d8395a8ec20bdd61a8b8041d3bfd93.tar.gz
opensim-SC_OLD-a13022c296d8395a8ec20bdd61a8b8041d3bfd93.tar.bz2
opensim-SC_OLD-a13022c296d8395a8ec20bdd61a8b8041d3bfd93.tar.xz
minor: in "show server throttles", display unset if new client throttle value is not set rather than 0
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index e623ee9..b9f8305 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -181,12 +181,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
181 m_console.OutputFormat("Throttles for {0}", m_udpServer.Scene.Name); 181 m_console.OutputFormat("Throttles for {0}", m_udpServer.Scene.Name);
182 ConsoleDisplayList cdl = new ConsoleDisplayList(); 182 ConsoleDisplayList cdl = new ConsoleDisplayList();
183 cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); 183 cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled);
184
185 long maxSceneDripRate = m_udpServer.MaxTotalDripRate;
184 cdl.AddRow( 186 cdl.AddRow(
185 "Max scene throttle", 187 "Max scene throttle",
186 m_udpServer.MaxTotalDripRate != 0 ? string.Format("{0} kbps", m_udpServer.MaxTotalDripRate * 8 / 1000) : "unset"); 188 maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset");
189
190 int maxClientDripRate = m_udpServer.ThrottleRates.Total;
187 cdl.AddRow( 191 cdl.AddRow(
188 "Max new client throttle", 192 "Max new client throttle",
189 string.Format("{0} kbps", m_udpServer.ThrottleRates.Total * 8 / 1000)); 193 maxClientDripRate != 0 ? string.Format("{0} kbps", maxClientDripRate * 8 / 1000) : "unset");
190 194
191 m_console.Output(cdl.ToString()); 195 m_console.Output(cdl.ToString());
192 196