aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
index 596862b..9935512 100644
--- a/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneCommunicationService.cs
@@ -359,7 +359,8 @@ namespace OpenSim.Region.Environment.Scenes
359 /// and the regions where there are already child agents. We only send notification to the former. 359 /// and the regions where there are already child agents. We only send notification to the former.
360 List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region 360 List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region
361 neighbourHandles.Add(avatar.Scene.RegionInfo.RegionHandle); // add this region too 361 neighbourHandles.Add(avatar.Scene.RegionInfo.RegionHandle); // add this region too
362 List<ulong> previousRegionNeighbourHandles = new List<ulong>(avatar.Scene.GetChildrenSeeds(avatar.UUID).Keys); 362 List<ulong> previousRegionNeighbourHandles
363 = new List<ulong>(avatar.Scene.CapsModule.GetChildrenSeeds(avatar.UUID).Keys);
363 List<ulong> newRegions = NewNeighbours(neighbourHandles, previousRegionNeighbourHandles); 364 List<ulong> newRegions = NewNeighbours(neighbourHandles, previousRegionNeighbourHandles);
364 List<ulong> oldRegions = OldNeighbours(neighbourHandles, previousRegionNeighbourHandles); 365 List<ulong> oldRegions = OldNeighbours(neighbourHandles, previousRegionNeighbourHandles);
365 366
@@ -372,7 +373,9 @@ namespace OpenSim.Region.Environment.Scenes
372 avatar.DropOldNeighbours(oldRegions); 373 avatar.DropOldNeighbours(oldRegions);
373 374
374 /// Collect as many seeds as possible 375 /// Collect as many seeds as possible
375 Dictionary<ulong, string> seeds = new Dictionary<ulong, string>(avatar.Scene.GetChildrenSeeds(avatar.UUID)); 376 Dictionary<ulong, string> seeds
377 = new Dictionary<ulong, string>(avatar.Scene.CapsModule.GetChildrenSeeds(avatar.UUID));
378
376 //Console.WriteLine(" !!! No. of seeds: " + seeds.Count); 379 //Console.WriteLine(" !!! No. of seeds: " + seeds.Count);
377 if (!seeds.ContainsKey(avatar.Scene.RegionInfo.RegionHandle)) 380 if (!seeds.ContainsKey(avatar.Scene.RegionInfo.RegionHandle))
378 seeds.Add(avatar.Scene.RegionInfo.RegionHandle, avatar.ControllingClient.RequestClientInfo().CapsPath); 381 seeds.Add(avatar.Scene.RegionInfo.RegionHandle, avatar.ControllingClient.RequestClientInfo().CapsPath);
@@ -397,7 +400,7 @@ namespace OpenSim.Region.Environment.Scenes
397 seeds.Add(neighbour.RegionHandle, agent.CapsPath); 400 seeds.Add(neighbour.RegionHandle, agent.CapsPath);
398 } 401 }
399 else 402 else
400 agent.CapsPath = avatar.Scene.GetChildSeed(avatar.UUID, neighbour.RegionHandle); 403 agent.CapsPath = avatar.Scene.CapsModule.GetChildSeed(avatar.UUID, neighbour.RegionHandle);
401 404
402 cagents.Add(agent); 405 cagents.Add(agent);
403 } 406 }
@@ -409,7 +412,7 @@ namespace OpenSim.Region.Environment.Scenes
409 a.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds); 412 a.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds);
410 } 413 }
411 // These two are the same thing! 414 // These two are the same thing!
412 avatar.Scene.SetChildrenSeed(avatar.UUID, seeds); 415 avatar.Scene.CapsModule.SetChildrenSeed(avatar.UUID, seeds);
413 avatar.KnownRegions = seeds; 416 avatar.KnownRegions = seeds;
414 //avatar.Scene.DumpChildrenSeeds(avatar.UUID); 417 //avatar.Scene.DumpChildrenSeeds(avatar.UUID);
415 //avatar.DumpKnownRegions(); 418 //avatar.DumpKnownRegions();
@@ -821,7 +824,7 @@ namespace OpenSim.Region.Environment.Scenes
821 } 824 }
822 else 825 else
823 { 826 {
824 agentCircuit.CapsPath = avatar.Scene.GetChildSeed(avatar.UUID, reg.RegionHandle); 827 agentCircuit.CapsPath = avatar.Scene.CapsModule.GetChildSeed(avatar.UUID, reg.RegionHandle);
825 capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort 828 capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
826 + "/CAPS/" + agentCircuit.CapsPath + "0000/"; 829 + "/CAPS/" + agentCircuit.CapsPath + "0000/";
827 } 830 }