diff options
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/Application/OpenSim.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSim.cs | 77 |
1 files changed, 75 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index ed4b620..4081888 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -294,6 +294,18 @@ namespace OpenSim | |||
294 | "show connections", | 294 | "show connections", |
295 | "Show connection data", HandleShow); | 295 | "Show connection data", HandleShow); |
296 | 296 | ||
297 | m_console.Commands.AddCommand("region", false, "show circuits", | ||
298 | "show circuits", | ||
299 | "Show agent circuit data", HandleShow); | ||
300 | |||
301 | m_console.Commands.AddCommand("region", false, "show http-handlers", | ||
302 | "show http-handlers", | ||
303 | "Show all registered http handlers", HandleShow); | ||
304 | |||
305 | m_console.Commands.AddCommand("region", false, "show pending-objects", | ||
306 | "show pending-objects", | ||
307 | "Show # of objects on the pending queues of all scene viewers", HandleShow); | ||
308 | |||
297 | m_console.Commands.AddCommand("region", false, "show modules", | 309 | m_console.Commands.AddCommand("region", false, "show modules", |
298 | "show modules", | 310 | "show modules", |
299 | "Show module data", HandleShow); | 311 | "Show module data", HandleShow); |
@@ -943,6 +955,66 @@ namespace OpenSim | |||
943 | MainConsole.Instance.Output(connections.ToString()); | 955 | MainConsole.Instance.Output(connections.ToString()); |
944 | break; | 956 | break; |
945 | 957 | ||
958 | case "circuits": | ||
959 | System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n"); | ||
960 | m_sceneManager.ForEachScene( | ||
961 | delegate(Scene scene) | ||
962 | { | ||
963 | //this.HttpServer. | ||
964 | acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName); | ||
965 | foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.AgentCircuits.Values) | ||
966 | acd.AppendFormat("\t{0} {1} ({2})\n", aCircuit.firstname, aCircuit.lastname, (aCircuit.child ? "Child" : "Root")); | ||
967 | } | ||
968 | ); | ||
969 | |||
970 | MainConsole.Instance.Output(acd.ToString()); | ||
971 | break; | ||
972 | |||
973 | case "http-handlers": | ||
974 | System.Text.StringBuilder handlers = new System.Text.StringBuilder("Registered HTTP Handlers:\n"); | ||
975 | |||
976 | handlers.AppendFormat("* XMLRPC:\n"); | ||
977 | foreach (String s in HttpServer.GetXmlRpcHandlerKeys()) | ||
978 | handlers.AppendFormat("\t{0}\n", s); | ||
979 | |||
980 | handlers.AppendFormat("* HTTP:\n"); | ||
981 | List<String> poll = HttpServer.GetPollServiceHandlerKeys(); | ||
982 | foreach (String s in HttpServer.GetHTTPHandlerKeys()) | ||
983 | handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty)); | ||
984 | |||
985 | handlers.AppendFormat("* Agent:\n"); | ||
986 | foreach (String s in HttpServer.GetAgentHandlerKeys()) | ||
987 | handlers.AppendFormat("\t{0}\n", s); | ||
988 | |||
989 | handlers.AppendFormat("* LLSD:\n"); | ||
990 | foreach (String s in HttpServer.GetLLSDHandlerKeys()) | ||
991 | handlers.AppendFormat("\t{0}\n", s); | ||
992 | |||
993 | handlers.AppendFormat("* StreamHandlers ({0}):\n", HttpServer.GetStreamHandlerKeys().Count); | ||
994 | foreach (String s in HttpServer.GetStreamHandlerKeys()) | ||
995 | handlers.AppendFormat("\t{0}\n", s); | ||
996 | |||
997 | MainConsole.Instance.Output(handlers.ToString()); | ||
998 | break; | ||
999 | |||
1000 | case "pending-objects": | ||
1001 | System.Text.StringBuilder pending = new System.Text.StringBuilder("Pending objects:\n"); | ||
1002 | m_sceneManager.ForEachScene( | ||
1003 | delegate(Scene scene) | ||
1004 | { | ||
1005 | scene.ForEachScenePresence( | ||
1006 | delegate(ScenePresence sp) | ||
1007 | { | ||
1008 | pending.AppendFormat("{0}: {1} {2} pending\n", | ||
1009 | scene.RegionInfo.RegionName, sp.Name, sp.SceneViewer.GetPendingObjectsCount()); | ||
1010 | } | ||
1011 | ); | ||
1012 | } | ||
1013 | ); | ||
1014 | |||
1015 | MainConsole.Instance.Output(pending.ToString()); | ||
1016 | break; | ||
1017 | |||
946 | case "modules": | 1018 | case "modules": |
947 | MainConsole.Instance.Output("The currently loaded shared modules are:"); | 1019 | MainConsole.Instance.Output("The currently loaded shared modules are:"); |
948 | foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) | 1020 | foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules) |
@@ -958,11 +1030,12 @@ namespace OpenSim | |||
958 | delegate(Scene scene) | 1030 | delegate(Scene scene) |
959 | { | 1031 | { |
960 | MainConsole.Instance.Output(String.Format( | 1032 | MainConsole.Instance.Output(String.Format( |
961 | "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}", | 1033 | "Region Name: {0}, Region XLoc: {1}, Region YLoc: {2}, Region Port: {3}, Estate Name: {4}", |
962 | scene.RegionInfo.RegionName, | 1034 | scene.RegionInfo.RegionName, |
963 | scene.RegionInfo.RegionLocX, | 1035 | scene.RegionInfo.RegionLocX, |
964 | scene.RegionInfo.RegionLocY, | 1036 | scene.RegionInfo.RegionLocY, |
965 | scene.RegionInfo.InternalEndPoint.Port)); | 1037 | scene.RegionInfo.InternalEndPoint.Port, |
1038 | scene.RegionInfo.EstateSettings.EstateName)); | ||
966 | }); | 1039 | }); |
967 | break; | 1040 | break; |
968 | 1041 | ||