diff options
author | Justin Clark-Casey (justincc) | 2012-09-12 00:10:48 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-12 00:10:48 +0100 |
commit | d53a53d4c599e77f039149128526ac67570b30fb (patch) | |
tree | cd987fb804a44b9bd873c7a61950455c60270ade /OpenSim/Region/Application/OpenSim.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-d53a53d4c599e77f039149128526ac67570b30fb.zip opensim-SC-d53a53d4c599e77f039149128526ac67570b30fb.tar.gz opensim-SC-d53a53d4c599e77f039149128526ac67570b30fb.tar.bz2 opensim-SC-d53a53d4c599e77f039149128526ac67570b30fb.tar.xz |
Make "show http-handlers" command available for ROBUST instances as well as the simulator executable.
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 769eea8..ed339fd 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -332,10 +332,6 @@ namespace OpenSim | |||
332 | "show circuits", | 332 | "show circuits", |
333 | "Show agent circuit data", HandleShow); | 333 | "Show agent circuit data", HandleShow); |
334 | 334 | ||
335 | m_console.Commands.AddCommand("Comms", false, "show http-handlers", | ||
336 | "show http-handlers", | ||
337 | "Show all registered http handlers", HandleShow); | ||
338 | |||
339 | m_console.Commands.AddCommand("Comms", false, "show pending-objects", | 335 | m_console.Commands.AddCommand("Comms", false, "show pending-objects", |
340 | "show pending-objects", | 336 | "show pending-objects", |
341 | "Show # of objects on the pending queues of all scene viewers", HandleShow); | 337 | "Show # of objects on the pending queues of all scene viewers", HandleShow); |
@@ -1013,33 +1009,6 @@ namespace OpenSim | |||
1013 | HandleShowCircuits(); | 1009 | HandleShowCircuits(); |
1014 | break; | 1010 | break; |
1015 | 1011 | ||
1016 | case "http-handlers": | ||
1017 | System.Text.StringBuilder handlers = new System.Text.StringBuilder("Registered HTTP Handlers:\n"); | ||
1018 | |||
1019 | handlers.AppendFormat("* XMLRPC:\n"); | ||
1020 | foreach (String s in HttpServer.GetXmlRpcHandlerKeys()) | ||
1021 | handlers.AppendFormat("\t{0}\n", s); | ||
1022 | |||
1023 | handlers.AppendFormat("* HTTP:\n"); | ||
1024 | List<String> poll = HttpServer.GetPollServiceHandlerKeys(); | ||
1025 | foreach (String s in HttpServer.GetHTTPHandlerKeys()) | ||
1026 | handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty)); | ||
1027 | |||
1028 | handlers.AppendFormat("* Agent:\n"); | ||
1029 | foreach (String s in HttpServer.GetAgentHandlerKeys()) | ||
1030 | handlers.AppendFormat("\t{0}\n", s); | ||
1031 | |||
1032 | handlers.AppendFormat("* LLSD:\n"); | ||
1033 | foreach (String s in HttpServer.GetLLSDHandlerKeys()) | ||
1034 | handlers.AppendFormat("\t{0}\n", s); | ||
1035 | |||
1036 | handlers.AppendFormat("* StreamHandlers ({0}):\n", HttpServer.GetStreamHandlerKeys().Count); | ||
1037 | foreach (String s in HttpServer.GetStreamHandlerKeys()) | ||
1038 | handlers.AppendFormat("\t{0}\n", s); | ||
1039 | |||
1040 | MainConsole.Instance.Output(handlers.ToString()); | ||
1041 | break; | ||
1042 | |||
1043 | case "modules": | 1012 | case "modules": |
1044 | MainConsole.Instance.Output("The currently loaded shared modules are:"); | 1013 | MainConsole.Instance.Output("The currently loaded shared modules are:"); |
1045 | foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) | 1014 | foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) |