aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2010-10-03 20:01:59 -0700
committerDiva Canto2010-10-03 20:01:59 -0700
commit0772e19af25b8524fa2527a4d5f3bac496d07811 (patch)
tree1106f2145d5218e0c4ebf453b213e2d70c822a72 /OpenSim/Region
parentReplaced OpenMetaverse dlls with ones compiled in Windows. (diff)
downloadopensim-SC_OLD-0772e19af25b8524fa2527a4d5f3bac496d07811.zip
opensim-SC_OLD-0772e19af25b8524fa2527a4d5f3bac496d07811.tar.gz
opensim-SC_OLD-0772e19af25b8524fa2527a4d5f3bac496d07811.tar.bz2
opensim-SC_OLD-0772e19af25b8524fa2527a4d5f3bac496d07811.tar.xz
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs22
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 81f49b6..38fff1c 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))
@@ -955,16 +959,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
955 agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); 959 agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
956 960
957 agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); 961 agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
958 m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count); 962 //m_log.DebugFormat("[XXX] Seeds 1 {0}", agent.ChildrenCapSeeds.Count);
959 963
960 if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle)) 964 if (!agent.ChildrenCapSeeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
961 agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath); 965 agent.ChildrenCapSeeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
962 m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count); 966 //m_log.DebugFormat("[XXX] Seeds 2 {0}", agent.ChildrenCapSeeds.Count);
963 967
964 sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath); 968 sp.AddNeighbourRegion(region.RegionHandle, agent.CapsPath);
965 foreach (ulong h in agent.ChildrenCapSeeds.Keys) 969 //foreach (ulong h in agent.ChildrenCapSeeds.Keys)
966 m_log.DebugFormat("[XXX] --> {0}", h); 970 // m_log.DebugFormat("[XXX] --> {0}", h);
967 m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle); 971 //m_log.DebugFormat("[XXX] Adding {0}", region.RegionHandle);
968 agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath); 972 agent.ChildrenCapSeeds.Add(region.RegionHandle, agent.CapsPath);
969 973
970 if (sp.Scene.CapsModule != null) 974 if (sp.Scene.CapsModule != null)
@@ -975,7 +979,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
975 if (currentAgentCircuit != null) 979 if (currentAgentCircuit != null)
976 { 980 {
977 agent.ServiceURLs = currentAgentCircuit.ServiceURLs; 981 agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
982 agent.IPAddress = currentAgentCircuit.IPAddress;
978 agent.Viewer = currentAgentCircuit.Viewer; 983 agent.Viewer = currentAgentCircuit.Viewer;
984 agent.Channel = currentAgentCircuit.Channel;
985 agent.Mac = currentAgentCircuit.Mac;
986 agent.Id0 = currentAgentCircuit.Id0;
979 } 987 }
980 988
981 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync; 989 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
@@ -1064,7 +1072,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1064 if (currentAgentCircuit != null) 1072 if (currentAgentCircuit != null)
1065 { 1073 {
1066 agent.ServiceURLs = currentAgentCircuit.ServiceURLs; 1074 agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
1075 agent.IPAddress = currentAgentCircuit.IPAddress;
1067 agent.Viewer = currentAgentCircuit.Viewer; 1076 agent.Viewer = currentAgentCircuit.Viewer;
1077 agent.Channel = currentAgentCircuit.Channel;
1078 agent.Mac = currentAgentCircuit.Mac;
1079 agent.Id0 = currentAgentCircuit.Id0;
1068 } 1080 }
1069 1081
1070 if (newRegions.Contains(neighbour.RegionHandle)) 1082 if (newRegions.Contains(neighbour.RegionHandle))