diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 1cd2ff4..d506208 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -301,7 +301,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
301 | if (currentAgentCircuit != null) | 301 | if (currentAgentCircuit != null) |
302 | { | 302 | { |
303 | agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs; | 303 | agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs; |
304 | agentCircuit.IPAddress = currentAgentCircuit.IPAddress; | ||
304 | agentCircuit.Viewer = currentAgentCircuit.Viewer; | 305 | agentCircuit.Viewer = currentAgentCircuit.Viewer; |
306 | agentCircuit.Channel = currentAgentCircuit.Channel; | ||
307 | agentCircuit.Mac = currentAgentCircuit.Mac; | ||
308 | agentCircuit.Id0 = currentAgentCircuit.Id0; | ||
305 | } | 309 | } |
306 | 310 | ||
307 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) | 311 | if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY)) |
@@ -979,16 +983,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
979 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 983 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |
980 | 984 | ||
981 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); | 985 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); |
982 | m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count); | 986 | //m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count); |
983 | 987 | ||
984 | if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle)) | 988 | if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle)) |
985 | agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath); | 989 | agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath); |
986 | m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count); | 990 | //m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count); |
987 | 991 | ||
988 | sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath); | 992 | sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath); |
989 | foreach (ulong h in agent.ChildrenCapSeeds.Keys) | 993 | //foreach (ulong h in agent.ChildrenCapSeeds.Keys) |
990 | m_log.DebugFormat("[XXX] --> {0}", h); | 994 | // m_log.DebugFormat("[XXX] --> {0}", h); |
991 | m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); | 995 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); |
992 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); | 996 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); |
993 | 997 | ||
994 | if (sp.Scene.CapsModule != null) | 998 | if (sp.Scene.CapsModule != null) |
@@ -999,7 +1003,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
999 | if (currentAgentCircuit != null) | 1003 | if (currentAgentCircuit != null) |
1000 | { | 1004 | { |
1001 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 1005 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |
1006 | agent.IPAddress = currentAgentCircuit.IPAddress; | ||
1002 | agent.Viewer = currentAgentCircuit.Viewer; | 1007 | agent.Viewer = currentAgentCircuit.Viewer; |
1008 | agent.Channel = currentAgentCircuit.Channel; | ||
1009 | agent.Mac = currentAgentCircuit.Mac; | ||
1010 | agent.Id0 = currentAgentCircuit.Id0; | ||
1003 | } | 1011 | } |
1004 | 1012 | ||
1005 | IPEndPoint external = region.ExternalEndPoint; | 1013 | IPEndPoint external = region.ExternalEndPoint; |
@@ -1092,7 +1100,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1092 | if (currentAgentCircuit != null) | 1100 | if (currentAgentCircuit != null) |
1093 | { | 1101 | { |
1094 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 1102 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |
1103 | agent.IPAddress = currentAgentCircuit.IPAddress; | ||
1095 | agent.Viewer = currentAgentCircuit.Viewer; | 1104 | agent.Viewer = currentAgentCircuit.Viewer; |
1105 | agent.Channel = currentAgentCircuit.Channel; | ||
1106 | agent.Mac = currentAgentCircuit.Mac; | ||
1107 | agent.Id0 = currentAgentCircuit.Id0; | ||
1096 | } | 1108 | } |
1097 | 1109 | ||
1098 | if (newRegions.Contains(neighbour.RegionHandle)) | 1110 | if (newRegions.Contains(neighbour.RegionHandle)) |