aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-10-08 00:46:24 +0100
committerJustin Clark-Casey (justincc)2014-11-25 23:18:40 +0000
commit87d5da86a1d5d91c1bec5eda2b82bcdf0cbdb38c (patch)
treeca56986f39c1496e7a74c457ccabcea46559b2cc /OpenSim
parentminor: in "show server throttles", display unset if new client throttle value... (diff)
downloadopensim-SC-87d5da86a1d5d91c1bec5eda2b82bcdf0cbdb38c.zip
opensim-SC-87d5da86a1d5d91c1bec5eda2b82bcdf0cbdb38c.tar.gz
opensim-SC-87d5da86a1d5d91c1bec5eda2b82bcdf0cbdb38c.tar.bz2
opensim-SC-87d5da86a1d5d91c1bec5eda2b82bcdf0cbdb38c.tar.xz
Fix recent regression in "debug lludp throttles get" command that stopped it printing any information. Also fix max throttle displayed to be properly kbps
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
index b9f8305..52247ab 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs
@@ -419,7 +419,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
419 { 419 {
420 if (all || (sp.Firstname == firstName && sp.Lastname == lastName)) 420 if (all || (sp.Firstname == firstName && sp.Lastname == lastName))
421 { 421 {
422 MainConsole.Instance.OutputFormat( 422 m_console.OutputFormat(
423 "Status for {0} ({1}) in {2}", 423 "Status for {0} ({1}) in {2}",
424 sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); 424 sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name);
425 425
@@ -427,7 +427,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
427 427
428 ConsoleDisplayList cdl = new ConsoleDisplayList(); 428 ConsoleDisplayList cdl = new ConsoleDisplayList();
429 cdl.AddRow("Adaptive throttle", udpClient.FlowThrottle.Enabled); 429 cdl.AddRow("Adaptive throttle", udpClient.FlowThrottle.Enabled);
430 cdl.AddRow("Max throttle", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate / 8 * 1000)); 430 cdl.AddRow("Max throttle", string.Format("{0} kbps", udpClient.FlowThrottle.RequestedDripRate * 8 / 1000));
431
432 m_console.Output(cdl.ToString());
431 } 433 }
432 }); 434 });
433 } 435 }