diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs index ac6c0b4..6e6a2d1 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServerCommands.cs | |||
@@ -48,6 +48,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
48 | 48 | ||
49 | public void Register() | 49 | public void Register() |
50 | { | 50 | { |
51 | /* | ||
51 | m_console.Commands.AddCommand( | 52 | m_console.Commands.AddCommand( |
52 | "Comms", false, "show server throttles", | 53 | "Comms", false, "show server throttles", |
53 | "show server throttles", | 54 | "show server throttles", |
@@ -213,6 +214,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
213 | "Set a debug parameter for a particular client. If no name is given then the value is set on all clients.", | 214 | "Set a debug parameter for a particular client. If no name is given then the value is set on all clients.", |
214 | "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.", | 215 | "process-unacked-sends - Do we take action if a sent reliable packet has not been acked.", |
215 | HandleClientSetCommand); | 216 | HandleClientSetCommand); |
217 | */ | ||
216 | } | 218 | } |
217 | 219 | ||
218 | private void HandleShowServerThrottlesCommand(string module, string[] args) | 220 | private void HandleShowServerThrottlesCommand(string module, string[] args) |
@@ -224,7 +226,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
224 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 226 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
225 | cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); | 227 | cdl.AddRow("Adaptive throttles", m_udpServer.ThrottleRates.AdaptiveThrottlesEnabled); |
226 | 228 | ||
227 | long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate; | 229 | long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate; |
228 | cdl.AddRow( | 230 | cdl.AddRow( |
229 | "Max scene throttle", | 231 | "Max scene throttle", |
230 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); | 232 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); |
@@ -505,7 +507,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
505 | m_console.OutputFormat("Debug settings for {0}", m_udpServer.Scene.Name); | 507 | m_console.OutputFormat("Debug settings for {0}", m_udpServer.Scene.Name); |
506 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | 508 | ConsoleDisplayList cdl = new ConsoleDisplayList(); |
507 | 509 | ||
508 | long maxSceneDripRate = m_udpServer.Throttle.MaxDripRate; | 510 | long maxSceneDripRate = (long)m_udpServer.Throttle.MaxDripRate; |
509 | cdl.AddRow( | 511 | cdl.AddRow( |
510 | "max-scene-throttle", | 512 | "max-scene-throttle", |
511 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); | 513 | maxSceneDripRate != 0 ? string.Format("{0} kbps", maxSceneDripRate * 8 / 1000) : "unset"); |
@@ -556,6 +558,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
556 | m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name); | 558 | m_console.OutputFormat("{0} set to {1} in {2}", param, rawValue, m_udpServer.Scene.Name); |
557 | } | 559 | } |
558 | 560 | ||
561 | /* not in use, nothing to set/get from lludp | ||
559 | private void HandleClientGetCommand(string module, string[] args) | 562 | private void HandleClientGetCommand(string module, string[] args) |
560 | { | 563 | { |
561 | if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene) | 564 | if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene) |
@@ -582,11 +585,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
582 | m_console.OutputFormat( | 585 | m_console.OutputFormat( |
583 | "Client debug parameters for {0} ({1}) in {2}", | 586 | "Client debug parameters for {0} ({1}) in {2}", |
584 | sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); | 587 | sp.Name, sp.IsChildAgent ? "child" : "root", m_udpServer.Scene.Name); |
585 | |||
586 | ConsoleDisplayList cdl = new ConsoleDisplayList(); | ||
587 | cdl.AddRow("process-unacked-sends", udpClient.ProcessUnackedSends); | ||
588 | |||
589 | m_console.Output(cdl.ToString()); | ||
590 | } | 588 | } |
591 | }); | 589 | }); |
592 | } | 590 | } |
@@ -609,28 +607,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
609 | 607 | ||
610 | if (args.Length == 8) | 608 | if (args.Length == 8) |
611 | name = string.Format("{0} {1}", args[6], args[7]); | 609 | name = string.Format("{0} {1}", args[6], args[7]); |
612 | 610 | // nothing here now | |
613 | if (param == "process-unacked-sends") | ||
614 | { | ||
615 | bool newValue; | ||
616 | |||
617 | if (!ConsoleUtil.TryParseConsoleBool(MainConsole.Instance, rawValue, out newValue)) | ||
618 | return; | ||
619 | |||
620 | m_udpServer.Scene.ForEachScenePresence( | ||
621 | sp => | ||
622 | { | ||
623 | if ((name == null || sp.Name == name) && sp.ControllingClient is LLClientView) | ||
624 | { | ||
625 | LLUDPClient udpClient = ((LLClientView)sp.ControllingClient).UDPClient; | ||
626 | udpClient.ProcessUnackedSends = newValue; | ||
627 | |||
628 | m_console.OutputFormat("{0} set to {1} for {2} in {3}", param, newValue, sp.Name, m_udpServer.Scene.Name); | ||
629 | } | ||
630 | }); | ||
631 | } | ||
632 | } | 611 | } |
633 | 612 | */ | |
634 | private void HandlePacketCommand(string module, string[] args) | 613 | private void HandlePacketCommand(string module, string[] args) |
635 | { | 614 | { |
636 | if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene) | 615 | if (SceneManager.Instance.CurrentScene != null && SceneManager.Instance.CurrentScene != m_udpServer.Scene) |