aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs24
-rw-r--r--OpenSim/Region/Application/OpenSimBackground.cs1
2 files changed, 24 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index 4d8409bb..ca6a2a3 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -239,6 +239,10 @@ namespace OpenSim
239 "show users [full]", 239 "show users [full]",
240 "Show user data", HandleShow); 240 "Show user data", HandleShow);
241 241
242 m_console.Commands.AddCommand("region", false, "show connections",
243 "show connections",
244 "Show connection data", HandleShow);
245
242 m_console.Commands.AddCommand("region", false, "show users full", 246 m_console.Commands.AddCommand("region", false, "show users full",
243 "show users full", 247 "show users full",
244 String.Empty, HandleShow); 248 String.Empty, HandleShow);
@@ -921,7 +925,25 @@ namespace OpenSim
921 regionName)); 925 regionName));
922 } 926 }
923 927
924 m_log.Info(""); 928 m_log.Info(String.Empty);
929 break;
930
931 case "connections":
932 System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n");
933 m_sceneManager.ForEachScene(
934 delegate(Scene scene)
935 {
936 scene.ClientManager.ForEachSync(
937 delegate(IClientAPI client)
938 {
939 connections.AppendFormat("{0}: {1} ({2}) from {3} on circuit {4}\n",
940 scene.RegionInfo.RegionName, client.Name, client.AgentId, client.RemoteEndPoint, client.CircuitCode);
941 }
942 );
943 }
944 );
945
946 m_log.Info(connections.ToString());
925 break; 947 break;
926 948
927 case "modules": 949 case "modules":
diff --git a/OpenSim/Region/Application/OpenSimBackground.cs b/OpenSim/Region/Application/OpenSimBackground.cs
index ac5e241..008c6b0 100644
--- a/OpenSim/Region/Application/OpenSimBackground.cs
+++ b/OpenSim/Region/Application/OpenSimBackground.cs
@@ -58,6 +58,7 @@ namespace OpenSim
58 m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : ""); 58 m_clientServers.Count.ToString(), m_clientServers.Count > 1 ? "s" : "");
59 59
60 WorldHasComeToAnEnd.WaitOne(); 60 WorldHasComeToAnEnd.WaitOne();
61 WorldHasComeToAnEnd.Close();
61 } 62 }
62 63
63 /// <summary> 64 /// <summary>