aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs19
-rw-r--r--OpenSim/Region/ClientStack/UDPServer.cs2
2 files changed, 14 insertions, 7 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index fdc3d79..6758808 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -880,13 +880,14 @@ namespace OpenSim
880 break; 880 break;
881 case "users": 881 case "users":
882 m_log.Error( 882 m_log.Error(
883 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}{6,-16}", "Firstname", "Lastname", 883 String.Format("{0,-16}{1,-16}{2,-37}{3,-16}{4,-22}{5,-16}", "Firstname", "Lastname",
884 "Agent ID", "Session ID", "Circuit", "IP", "World")); 884 "Agent ID", "Circuit", "IP", "Region"));
885 885
886 foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars()) 886 foreach (ScenePresence presence in m_sceneManager.GetCurrentSceneAvatars())
887 { 887 {
888 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle); 888 RegionInfo regionInfo = m_sceneManager.GetRegionInfo(presence.RegionHandle);
889 string regionName; 889 string regionName;
890 System.Net.EndPoint ep = null;
890 891
891 if (regionInfo == null) 892 if (regionInfo == null)
892 { 893 {
@@ -896,15 +897,21 @@ namespace OpenSim
896 { 897 {
897 regionName = regionInfo.RegionName; 898 regionName = regionInfo.RegionName;
898 } 899 }
900 for (int i = 0; i < m_udpServers.Count; i++)
901 {
902 if (m_udpServers[i].RegionHandle == presence.RegionHandle)
903 {
899 904
905 m_udpServers[i].clientCircuits_reverse.TryGetValue(presence.ControllingClient.CircuitCode, out ep);
906 }
907 }
900 m_log.Error( 908 m_log.Error(
901 String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}{6,-16}", 909 String.Format("{0,-16}{1,-16}{2,-37}{3,-16}{4,-22}{5,-16}",
902 presence.Firstname, 910 presence.Firstname,
903 presence.Lastname, 911 presence.Lastname,
904 presence.UUID, 912 presence.UUID,
905 presence.ControllingClient.AgentId, 913 presence.ControllingClient.CircuitCode,
906 "Unknown", 914 ep,
907 "Unknown",
908 regionName)); 915 regionName));
909 } 916 }
910 917
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs
index bcbd81a..4e4a0aa 100644
--- a/OpenSim/Region/ClientStack/UDPServer.cs
+++ b/OpenSim/Region/ClientStack/UDPServer.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Region.ClientStack
40 public class UDPServer : ClientStackNetworkHandler 40 public class UDPServer : ClientStackNetworkHandler
41 { 41 {
42 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); 42 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
43 protected Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>(); 43 public Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>();
44 public Socket Server; 44 public Socket Server;
45 protected IPEndPoint ServerIncoming; 45 protected IPEndPoint ServerIncoming;
46 protected byte[] RecvBuffer = new byte[4096]; 46 protected byte[] RecvBuffer = new byte[4096];