diff options
author | Melanie | 2012-07-13 02:27:16 +0100 |
---|---|---|
committer | Melanie | 2012-07-13 02:27:16 +0100 |
commit | 64393a7ca89e2c7c6f032f9da096feb8db7fb24f (patch) | |
tree | 12e0aaae0401cde2e4310f25efa96a64559ae939 /OpenSim/Region | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578 (diff) | |
download | opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.zip opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.gz opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.bz2 opensim-SC_OLD-64393a7ca89e2c7c6f032f9da096feb8db7fb24f.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region')
11 files changed, 99 insertions, 116 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs index 1458ff9..e6b57c2 100644 --- a/OpenSim/Region/Application/OpenSim.cs +++ b/OpenSim/Region/Application/OpenSim.cs | |||
@@ -996,44 +996,11 @@ namespace OpenSim | |||
996 | break; | 996 | break; |
997 | 997 | ||
998 | case "connections": | 998 | case "connections": |
999 | System.Text.StringBuilder connections = new System.Text.StringBuilder("Connections:\n"); | 999 | HandleShowConnections(); |
1000 | m_sceneManager.ForEachScene( | ||
1001 | delegate(Scene scene) { | ||
1002 | scene.ForEachClient( | ||
1003 | delegate(IClientAPI client) { | ||
1004 | connections.AppendFormat( | ||
1005 | "{0}: {1} ({2}) from {3} on circuit {4}\n", | ||
1006 | scene.RegionInfo.RegionName, | ||
1007 | client.Name, | ||
1008 | client.AgentId, | ||
1009 | client.RemoteEndPoint, | ||
1010 | client.CircuitCode | ||
1011 | ); | ||
1012 | } | ||
1013 | ); | ||
1014 | } | ||
1015 | ); | ||
1016 | |||
1017 | MainConsole.Instance.Output(connections.ToString()); | ||
1018 | break; | 1000 | break; |
1019 | 1001 | ||
1020 | case "circuits": | 1002 | case "circuits": |
1021 | System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n"); | 1003 | HandleShowCircuits(); |
1022 | m_sceneManager.ForEachScene( | ||
1023 | delegate(Scene scene) { | ||
1024 | //this.HttpServer. | ||
1025 | acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName); | ||
1026 | foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.GetAgentCircuits().Values) | ||
1027 | acd.AppendFormat( | ||
1028 | "\t{0} {1} ({2})\n", | ||
1029 | aCircuit.firstname, | ||
1030 | aCircuit.lastname, | ||
1031 | (aCircuit.child ? "Child" : "Root") | ||
1032 | ); | ||
1033 | } | ||
1034 | ); | ||
1035 | |||
1036 | MainConsole.Instance.Output(acd.ToString()); | ||
1037 | break; | 1004 | break; |
1038 | 1005 | ||
1039 | case "http-handlers": | 1006 | case "http-handlers": |
@@ -1138,6 +1105,53 @@ namespace OpenSim | |||
1138 | } | 1105 | } |
1139 | } | 1106 | } |
1140 | 1107 | ||
1108 | private void HandleShowCircuits() | ||
1109 | { | ||
1110 | ConsoleDisplayTable cdt = new ConsoleDisplayTable(); | ||
1111 | cdt.AddColumn("Region", 20); | ||
1112 | cdt.AddColumn("Avatar name", 24); | ||
1113 | cdt.AddColumn("Type", 5); | ||
1114 | cdt.AddColumn("Code", 10); | ||
1115 | cdt.AddColumn("IP", 16); | ||
1116 | cdt.AddColumn("Viewer Name", 24); | ||
1117 | |||
1118 | m_sceneManager.ForEachScene( | ||
1119 | s => | ||
1120 | { | ||
1121 | foreach (AgentCircuitData aCircuit in s.AuthenticateHandler.GetAgentCircuits().Values) | ||
1122 | cdt.AddRow( | ||
1123 | s.Name, | ||
1124 | aCircuit.Name, | ||
1125 | aCircuit.child ? "child" : "root", | ||
1126 | aCircuit.circuitcode.ToString(), | ||
1127 | aCircuit.IPAddress.ToString(), | ||
1128 | aCircuit.Viewer); | ||
1129 | }); | ||
1130 | |||
1131 | MainConsole.Instance.Output(cdt.ToString()); | ||
1132 | } | ||
1133 | |||
1134 | private void HandleShowConnections() | ||
1135 | { | ||
1136 | ConsoleDisplayTable cdt = new ConsoleDisplayTable(); | ||
1137 | cdt.AddColumn("Region", 20); | ||
1138 | cdt.AddColumn("Avatar name", 24); | ||
1139 | cdt.AddColumn("Circuit code", 12); | ||
1140 | cdt.AddColumn("Endpoint", 23); | ||
1141 | cdt.AddColumn("Active?", 7); | ||
1142 | |||
1143 | m_sceneManager.ForEachScene( | ||
1144 | s => s.ForEachClient( | ||
1145 | c => cdt.AddRow( | ||
1146 | s.Name, | ||
1147 | c.Name, | ||
1148 | c.RemoteEndPoint.ToString(), | ||
1149 | c.CircuitCode.ToString(), | ||
1150 | c.IsActive.ToString()))); | ||
1151 | |||
1152 | MainConsole.Instance.Output(cdt.ToString()); | ||
1153 | } | ||
1154 | |||
1141 | /// <summary> | 1155 | /// <summary> |
1142 | /// Use XML2 format to serialize data to a file | 1156 | /// Use XML2 format to serialize data to a file |
1143 | /// </summary> | 1157 | /// </summary> |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 3461971..e6289bd 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
59 | /// Handles new client connections | 59 | /// Handles new client connections |
60 | /// Constructor takes a single Packet and authenticates everything | 60 | /// Constructor takes a single Packet and authenticates everything |
61 | /// </summary> | 61 | /// </summary> |
62 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IClientIPEndpoint, IStatsCollector | 62 | public class LLClientView : IClientAPI, IClientCore, IClientIM, IClientChat, IClientInventory, IStatsCollector |
63 | { | 63 | { |
64 | /// <value> | 64 | /// <value> |
65 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. | 65 | /// Debug packet level. See OpenSim.RegisterConsoleCommands() for more details. |
@@ -365,7 +365,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
365 | protected string m_lastName; | 365 | protected string m_lastName; |
366 | protected Thread m_clientThread; | 366 | protected Thread m_clientThread; |
367 | protected Vector3 m_startpos; | 367 | protected Vector3 m_startpos; |
368 | protected EndPoint m_userEndPoint; | ||
369 | protected UUID m_activeGroupID; | 368 | protected UUID m_activeGroupID; |
370 | protected string m_activeGroupName = String.Empty; | 369 | protected string m_activeGroupName = String.Empty; |
371 | protected ulong m_activeGroupPowers; | 370 | protected ulong m_activeGroupPowers; |
@@ -458,7 +457,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
458 | /// <summary> | 457 | /// <summary> |
459 | /// Constructor | 458 | /// Constructor |
460 | /// </summary> | 459 | /// </summary> |
461 | public LLClientView(EndPoint remoteEP, Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo, | 460 | public LLClientView(Scene scene, LLUDPServer udpServer, LLUDPClient udpClient, AuthenticateResponse sessionInfo, |
462 | UUID agentId, UUID sessionId, uint circuitCode) | 461 | UUID agentId, UUID sessionId, uint circuitCode) |
463 | { | 462 | { |
464 | // DebugPacketLevel = 1; | 463 | // DebugPacketLevel = 1; |
@@ -466,7 +465,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
466 | RegisterInterface<IClientIM>(this); | 465 | RegisterInterface<IClientIM>(this); |
467 | RegisterInterface<IClientInventory>(this); | 466 | RegisterInterface<IClientInventory>(this); |
468 | RegisterInterface<IClientChat>(this); | 467 | RegisterInterface<IClientChat>(this); |
469 | RegisterInterface<IClientIPEndpoint>(this); | ||
470 | 468 | ||
471 | m_scene = scene; | 469 | m_scene = scene; |
472 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); | 470 | m_entityUpdates = new PriorityQueue(m_scene.Entities.Count); |
@@ -483,7 +481,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
483 | m_sessionId = sessionId; | 481 | m_sessionId = sessionId; |
484 | m_secureSessionId = sessionInfo.LoginInfo.SecureSession; | 482 | m_secureSessionId = sessionInfo.LoginInfo.SecureSession; |
485 | m_circuitCode = circuitCode; | 483 | m_circuitCode = circuitCode; |
486 | m_userEndPoint = remoteEP; | ||
487 | m_firstName = sessionInfo.LoginInfo.First; | 484 | m_firstName = sessionInfo.LoginInfo.First; |
488 | m_lastName = sessionInfo.LoginInfo.Last; | 485 | m_lastName = sessionInfo.LoginInfo.Last; |
489 | m_startpos = sessionInfo.LoginInfo.StartPos; | 486 | m_startpos = sessionInfo.LoginInfo.StartPos; |
@@ -11982,7 +11979,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11982 | { | 11979 | { |
11983 | ClientInfo info = m_udpClient.GetClientInfo(); | 11980 | ClientInfo info = m_udpClient.GetClientInfo(); |
11984 | 11981 | ||
11985 | info.userEP = m_userEndPoint; | ||
11986 | info.proxyEP = null; | 11982 | info.proxyEP = null; |
11987 | info.agentcircuit = RequestClientInfo(); | 11983 | info.agentcircuit = RequestClientInfo(); |
11988 | 11984 | ||
@@ -11994,11 +11990,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11994 | m_udpClient.SetClientInfo(info); | 11990 | m_udpClient.SetClientInfo(info); |
11995 | } | 11991 | } |
11996 | 11992 | ||
11997 | public EndPoint GetClientEP() | ||
11998 | { | ||
11999 | return m_userEndPoint; | ||
12000 | } | ||
12001 | |||
12002 | #region Media Parcel Members | 11993 | #region Media Parcel Members |
12003 | 11994 | ||
12004 | public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) | 11995 | public void SendParcelMediaCommand(uint flags, ParcelMediaCommandEnum command, float time) |
@@ -12272,24 +12263,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
12272 | return numPackets; | 12263 | return numPackets; |
12273 | } | 12264 | } |
12274 | 12265 | ||
12275 | #region IClientIPEndpoint Members | ||
12276 | |||
12277 | public IPAddress EndPoint | ||
12278 | { | ||
12279 | get | ||
12280 | { | ||
12281 | if (m_userEndPoint is IPEndPoint) | ||
12282 | { | ||
12283 | IPEndPoint ep = (IPEndPoint)m_userEndPoint; | ||
12284 | |||
12285 | return ep.Address; | ||
12286 | } | ||
12287 | return null; | ||
12288 | } | ||
12289 | } | ||
12290 | |||
12291 | #endregion | ||
12292 | |||
12293 | public void SendRebakeAvatarTextures(UUID textureID) | 12266 | public void SendRebakeAvatarTextures(UUID textureID) |
12294 | { | 12267 | { |
12295 | RebakeAvatarTexturesPacket pack = | 12268 | RebakeAvatarTexturesPacket pack = |
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 754d9d2..bcb45cf 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -1106,7 +1106,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1106 | { | 1106 | { |
1107 | LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); | 1107 | LLUDPClient udpClient = new LLUDPClient(this, ThrottleRates, m_throttle, circuitCode, agentID, remoteEndPoint, m_defaultRTO, m_maxRTO); |
1108 | 1108 | ||
1109 | client = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); | 1109 | client = new LLClientView(m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode); |
1110 | client.OnLogout += LogoutHandler; | 1110 | client.OnLogout += LogoutHandler; |
1111 | 1111 | ||
1112 | ((LLClientView)client).DisableFacelights = m_disableFacelights; | 1112 | ((LLClientView)client).DisableFacelights = m_disableFacelights; |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 540f33a..3c6e381 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | |||
@@ -41,8 +41,7 @@ using OpenMetaverse; | |||
41 | 41 | ||
42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | 42 | namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid |
43 | { | 43 | { |
44 | public class LocalGridServicesConnector : | 44 | public class LocalGridServicesConnector : ISharedRegionModule, IGridService |
45 | ISharedRegionModule, IGridService | ||
46 | { | 45 | { |
47 | private static readonly ILog m_log = | 46 | private static readonly ILog m_log = |
48 | LogManager.GetLogger( | 47 | LogManager.GetLogger( |
@@ -51,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
51 | private IGridService m_GridService; | 50 | private IGridService m_GridService; |
52 | private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>(); | 51 | private Dictionary<UUID, RegionCache> m_LocalCache = new Dictionary<UUID, RegionCache>(); |
53 | 52 | ||
54 | private bool m_Enabled = false; | 53 | private bool m_Enabled; |
55 | 54 | ||
56 | public LocalGridServicesConnector() | 55 | public LocalGridServicesConnector() |
57 | { | 56 | { |
@@ -59,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
59 | 58 | ||
60 | public LocalGridServicesConnector(IConfigSource source) | 59 | public LocalGridServicesConnector(IConfigSource source) |
61 | { | 60 | { |
62 | m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated"); | 61 | m_log.Debug("[LOCAL GRID SERVICE CONNECTOR]: LocalGridServicesConnector instantiated directly."); |
63 | InitialiseService(source); | 62 | InitialiseService(source); |
64 | } | 63 | } |
65 | 64 | ||
@@ -84,8 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
84 | if (name == Name) | 83 | if (name == Name) |
85 | { | 84 | { |
86 | InitialiseService(source); | 85 | InitialiseService(source); |
87 | m_Enabled = true; | 86 | m_log.Info("[LOCAL GRID SERVICE CONNECTOR]: Local grid connector enabled"); |
88 | m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled"); | ||
89 | } | 87 | } |
90 | } | 88 | } |
91 | } | 89 | } |
@@ -95,7 +93,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
95 | IConfig assetConfig = source.Configs["GridService"]; | 93 | IConfig assetConfig = source.Configs["GridService"]; |
96 | if (assetConfig == null) | 94 | if (assetConfig == null) |
97 | { | 95 | { |
98 | m_log.Error("[LOCAL GRID CONNECTOR]: GridService missing from OpenSim.ini"); | 96 | m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: GridService missing from OpenSim.ini"); |
99 | return; | 97 | return; |
100 | } | 98 | } |
101 | 99 | ||
@@ -104,7 +102,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
104 | 102 | ||
105 | if (serviceDll == String.Empty) | 103 | if (serviceDll == String.Empty) |
106 | { | 104 | { |
107 | m_log.Error("[LOCAL GRID CONNECTOR]: No LocalServiceModule named in section GridService"); | 105 | m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: No LocalServiceModule named in section GridService"); |
108 | return; | 106 | return; |
109 | } | 107 | } |
110 | 108 | ||
@@ -115,16 +113,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
115 | 113 | ||
116 | if (m_GridService == null) | 114 | if (m_GridService == null) |
117 | { | 115 | { |
118 | m_log.Error("[LOCAL GRID CONNECTOR]: Can't load grid service"); | 116 | m_log.Error("[LOCAL GRID SERVICE CONNECTOR]: Can't load grid service"); |
119 | return; | 117 | return; |
120 | } | 118 | } |
119 | |||
120 | m_Enabled = true; | ||
121 | } | 121 | } |
122 | 122 | ||
123 | public void PostInitialise() | 123 | public void PostInitialise() |
124 | { | 124 | { |
125 | // FIXME: We will still add this command even if we aren't enabled since RemoteGridServiceConnector | ||
126 | // will have instantiated us directly. | ||
125 | MainConsole.Instance.Commands.AddCommand("Regions", false, "show neighbours", | 127 | MainConsole.Instance.Commands.AddCommand("Regions", false, "show neighbours", |
126 | "show neighbours", | 128 | "show neighbours", |
127 | "Shows the local regions' neighbours", NeighboursCommand); | 129 | "Shows the local regions' neighbours", HandleShowNeighboursCommand); |
128 | } | 130 | } |
129 | 131 | ||
130 | public void Close() | 132 | public void Close() |
@@ -133,17 +135,22 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
133 | 135 | ||
134 | public void AddRegion(Scene scene) | 136 | public void AddRegion(Scene scene) |
135 | { | 137 | { |
136 | if (m_Enabled) | 138 | if (!m_Enabled) |
137 | scene.RegisterModuleInterface<IGridService>(this); | 139 | return; |
140 | |||
141 | scene.RegisterModuleInterface<IGridService>(this); | ||
138 | 142 | ||
139 | if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID)) | 143 | if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID)) |
140 | m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); | 144 | m_log.ErrorFormat("[LOCAL GRID SERVICE CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); |
141 | else | 145 | else |
142 | m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); | 146 | m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); |
143 | } | 147 | } |
144 | 148 | ||
145 | public void RemoveRegion(Scene scene) | 149 | public void RemoveRegion(Scene scene) |
146 | { | 150 | { |
151 | if (!m_Enabled) | ||
152 | return; | ||
153 | |||
147 | m_LocalCache[scene.RegionInfo.RegionID].Clear(); | 154 | m_LocalCache[scene.RegionInfo.RegionID].Clear(); |
148 | m_LocalCache.Remove(scene.RegionInfo.RegionID); | 155 | m_LocalCache.Remove(scene.RegionInfo.RegionID); |
149 | } | 156 | } |
@@ -232,7 +239,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid | |||
232 | 239 | ||
233 | #endregion | 240 | #endregion |
234 | 241 | ||
235 | public void NeighboursCommand(string module, string[] cmdparams) | 242 | public void HandleShowNeighboursCommand(string module, string[] cmdparams) |
236 | { | 243 | { |
237 | System.Text.StringBuilder caps = new System.Text.StringBuilder(); | 244 | System.Text.StringBuilder caps = new System.Text.StringBuilder(); |
238 | 245 | ||
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index 40cc536..7a90686 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs | |||
@@ -125,13 +125,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour | |||
125 | uint x, y; | 125 | uint x, y; |
126 | Utils.LongToUInts(regionHandle, out x, out y); | 126 | Utils.LongToUInts(regionHandle, out x, out y); |
127 | 127 | ||
128 | m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from region {0} to region at {1}-{2}", | ||
129 | thisRegion.RegionName, x / Constants.RegionSize, y / Constants.RegionSize); | ||
130 | |||
131 | foreach (Scene s in m_Scenes) | 128 | foreach (Scene s in m_Scenes) |
132 | { | 129 | { |
133 | if (s.RegionInfo.RegionHandle == regionHandle) | 130 | if (s.RegionInfo.RegionHandle == regionHandle) |
134 | { | 131 | { |
132 | m_log.DebugFormat("[LOCAL NEIGHBOUR SERVICE CONNECTOR]: HelloNeighbour from region {0} to neighbour {1} at {2}-{3}", | ||
133 | thisRegion.RegionName, s.Name, x / Constants.RegionSize, y / Constants.RegionSize); | ||
134 | |||
135 | //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); | 135 | //m_log.Debug("[NEIGHBOUR CONNECTOR]: Found region to SendHelloNeighbour"); |
136 | return s.IncomingHelloNeighbour(thisRegion); | 136 | return s.IncomingHelloNeighbour(thisRegion); |
137 | } | 137 | } |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index eae8b8e..19f319c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -811,7 +811,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
811 | } | 811 | } |
812 | } | 812 | } |
813 | 813 | ||
814 | string grant = startupConfig.GetString("AllowedViewerList", String.Empty); | 814 | string grant = startupConfig.GetString("AllowedClients", String.Empty); |
815 | if (grant.Length > 0) | 815 | if (grant.Length > 0) |
816 | { | 816 | { |
817 | foreach (string viewer in grant.Split(',')) | 817 | foreach (string viewer in grant.Split(',')) |
@@ -820,7 +820,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
820 | } | 820 | } |
821 | } | 821 | } |
822 | 822 | ||
823 | grant = startupConfig.GetString("BannedViewerList", String.Empty); | 823 | grant = startupConfig.GetString("BannedClients", String.Empty); |
824 | if (grant.Length > 0) | 824 | if (grant.Length > 0) |
825 | { | 825 | { |
826 | foreach (string viewer in grant.Split(',')) | 826 | foreach (string viewer in grant.Split(',')) |
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs index c1414ee..5d8447b 100644 --- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | |||
@@ -84,16 +84,23 @@ namespace OpenSim.Region.Framework.Scenes | |||
84 | if (neighbourService != null) | 84 | if (neighbourService != null) |
85 | neighbour = neighbourService.HelloNeighbour(regionhandle, region); | 85 | neighbour = neighbourService.HelloNeighbour(regionhandle, region); |
86 | else | 86 | else |
87 | m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: No neighbour service provided for informing neigbhours of this region"); | 87 | m_log.DebugFormat( |
88 | "[SCENE COMMUNICATION SERVICE]: No neighbour service provided for region {0} to inform neigbhours of status", | ||
89 | m_scene.Name); | ||
88 | 90 | ||
89 | if (neighbour != null) | 91 | if (neighbour != null) |
90 | { | 92 | { |
91 | m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: Successfully informed neighbour {0}-{1} that I'm here", x / Constants.RegionSize, y / Constants.RegionSize); | 93 | m_log.DebugFormat( |
94 | "[SCENE COMMUNICATION SERVICE]: Region {0} successfully informed neighbour {1} at {2}-{3} that it is up", | ||
95 | m_scene.Name, neighbour.RegionName, x / Constants.RegionSize, y / Constants.RegionSize); | ||
96 | |||
92 | m_scene.EventManager.TriggerOnRegionUp(neighbour); | 97 | m_scene.EventManager.TriggerOnRegionUp(neighbour); |
93 | } | 98 | } |
94 | else | 99 | else |
95 | { | 100 | { |
96 | m_log.InfoFormat("[SCENE COMMUNICATION SERVICE]: Failed to inform neighbour {0}-{1} that I'm here.", x / Constants.RegionSize, y / Constants.RegionSize); | 101 | m_log.WarnFormat( |
102 | "[SCENE COMMUNICATION SERVICE]: Region {0} failed to inform neighbour at {1}-{2} that it is up.", | ||
103 | x / Constants.RegionSize, y / Constants.RegionSize); | ||
97 | } | 104 | } |
98 | } | 105 | } |
99 | 106 | ||
@@ -101,8 +108,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
101 | { | 108 | { |
102 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); | 109 | //m_log.Info("[INTER]: " + debugRegionName + ": SceneCommunicationService: Sending InterRegion Notification that region is up " + region.RegionName); |
103 | 110 | ||
104 | List<GridRegion> neighbours = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); | 111 | List<GridRegion> neighbours |
105 | m_log.DebugFormat("[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that this region is up", neighbours.Count); | 112 | = m_scene.GridService.GetNeighbours(m_scene.RegionInfo.ScopeID, m_scene.RegionInfo.RegionID); |
113 | |||
114 | m_log.DebugFormat( | ||
115 | "[SCENE COMMUNICATION SERVICE]: Informing {0} neighbours that region {1} is up", | ||
116 | neighbours.Count, m_scene.Name); | ||
117 | |||
106 | foreach (GridRegion n in neighbours) | 118 | foreach (GridRegion n in neighbours) |
107 | { | 119 | { |
108 | InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; | 120 | InformNeighbourThatRegionUpDelegate d = InformNeighboursThatRegionIsUpAsync; |
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index b449089..17a210b 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
44 | { | 44 | { |
45 | public delegate void OnIRCClientReadyDelegate(IRCClientView cv); | 45 | public delegate void OnIRCClientReadyDelegate(IRCClientView cv); |
46 | 46 | ||
47 | public class IRCClientView : IClientAPI, IClientCore, IClientIPEndpoint | 47 | public class IRCClientView : IClientAPI, IClientCore |
48 | { | 48 | { |
49 | public event OnIRCClientReadyDelegate OnIRCReady; | 49 | public event OnIRCClientReadyDelegate OnIRCReady; |
50 | 50 | ||
@@ -1440,11 +1440,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1440 | Disconnect(); | 1440 | Disconnect(); |
1441 | } | 1441 | } |
1442 | 1442 | ||
1443 | public EndPoint GetClientEP() | ||
1444 | { | ||
1445 | return null; | ||
1446 | } | ||
1447 | |||
1448 | public ClientInfo GetClientInfo() | 1443 | public ClientInfo GetClientInfo() |
1449 | { | 1444 | { |
1450 | return new ClientInfo(); | 1445 | return new ClientInfo(); |
@@ -1642,15 +1637,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1642 | 1637 | ||
1643 | #endregion | 1638 | #endregion |
1644 | 1639 | ||
1645 | #region Implementation of IClientIPEndpoint | ||
1646 | |||
1647 | public IPAddress EndPoint | ||
1648 | { | ||
1649 | get { return ((IPEndPoint) m_client.Client.RemoteEndPoint).Address; } | ||
1650 | } | ||
1651 | |||
1652 | #endregion | ||
1653 | |||
1654 | public void SendRebakeAvatarTextures(UUID textureID) | 1640 | public void SendRebakeAvatarTextures(UUID textureID) |
1655 | { | 1641 | { |
1656 | } | 1642 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index 045661a..97db7e1 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
@@ -952,11 +952,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
952 | { | 952 | { |
953 | } | 953 | } |
954 | 954 | ||
955 | public EndPoint GetClientEP() | ||
956 | { | ||
957 | return null; | ||
958 | } | ||
959 | |||
960 | public ClientInfo GetClientInfo() | 955 | public ClientInfo GetClientInfo() |
961 | { | 956 | { |
962 | return null; | 957 | return null; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4d20f7b..bc20f71 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -883,13 +883,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
883 | if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence) | 883 | if (World.Entities.ContainsKey((UUID)agent) && World.Entities[avatarID] is ScenePresence) |
884 | { | 884 | { |
885 | ScenePresence target = (ScenePresence)World.Entities[avatarID]; | 885 | ScenePresence target = (ScenePresence)World.Entities[avatarID]; |
886 | EndPoint ep = target.ControllingClient.GetClientEP(); | 886 | return target.ControllingClient.RemoteEndPoint.Address.ToString(); |
887 | if (ep is IPEndPoint) | ||
888 | { | ||
889 | IPEndPoint ip = (IPEndPoint)ep; | ||
890 | return ip.Address.ToString(); | ||
891 | } | ||
892 | } | 887 | } |
888 | |||
893 | // fall through case, just return nothing | 889 | // fall through case, just return nothing |
894 | return ""; | 890 | return ""; |
895 | } | 891 | } |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 3ddf1d4..8d92ba5 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
@@ -954,7 +954,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
954 | try | 954 | try |
955 | { | 955 | { |
956 | FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")); | 956 | FileStream fs = File.Create(Path.Combine(Path.GetDirectoryName(assembly), ItemID.ToString() + ".state")); |
957 | Byte[] buf = (new UTF8Encoding()).GetBytes(xml); | 957 | Byte[] buf = Util.UTF8NoBomEncoding.GetBytes(xml); |
958 | fs.Write(buf, 0, buf.Length); | 958 | fs.Write(buf, 0, buf.Length); |
959 | fs.Close(); | 959 | fs.Close(); |
960 | } | 960 | } |