diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs')
-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 828c4e7..3791e1d 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)) |
@@ -943,16 +947,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
943 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 947 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |
944 | 948 | ||
945 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); | 949 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); |
946 | m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count); | 950 | //m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count); |
947 | 951 | ||
948 | if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle)) | 952 | if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle)) |
949 | agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath); | 953 | agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath); |
950 | m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count); | 954 | //m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count); |
951 | 955 | ||
952 | sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath); | 956 | sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath); |
953 | foreach (ulong h in agent.ChildrenCapSeeds.Keys) | 957 | //foreach (ulong h in agent.ChildrenCapSeeds.Keys) |
954 | m_log.DebugFormat("[XXX] --> {0}", h); | 958 | // m_log.DebugFormat("[XXX] --> {0}", h); |
955 | m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); | 959 | //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); |
956 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); | 960 | agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); |
957 | 961 | ||
958 | if (sp.Scene.CapsModule != null) | 962 | if (sp.Scene.CapsModule != null) |
@@ -963,7 +967,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
963 | if (currentAgentCircuit != null) | 967 | if (currentAgentCircuit != null) |
964 | { | 968 | { |
965 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 969 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |
970 | agent.IPAddress = currentAgentCircuit.IPAddress; | ||
966 | agent.Viewer = currentAgentCircuit.Viewer; | 971 | agent.Viewer = currentAgentCircuit.Viewer; |
972 | agent.Channel = currentAgentCircuit.Channel; | ||
973 | agent.Mac = currentAgentCircuit.Mac; | ||
974 | agent.Id0 = currentAgentCircuit.Id0; | ||
967 | } | 975 | } |
968 | 976 | ||
969 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; | 977 | InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; |
@@ -1052,7 +1060,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1052 | if (currentAgentCircuit != null) | 1060 | if (currentAgentCircuit != null) |
1053 | { | 1061 | { |
1054 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 1062 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |
1063 | agent.IPAddress = currentAgentCircuit.IPAddress; | ||
1055 | agent.Viewer = currentAgentCircuit.Viewer; | 1064 | agent.Viewer = currentAgentCircuit.Viewer; |
1065 | agent.Channel = currentAgentCircuit.Channel; | ||
1066 | agent.Mac = currentAgentCircuit.Mac; | ||
1067 | agent.Id0 = currentAgentCircuit.Id0; | ||
1056 | } | 1068 | } |
1057 | 1069 | ||
1058 | if (newRegions.Contains(neighbour.RegionHandle)) | 1070 | if (newRegions.Contains(neighbour.RegionHandle)) |