From 37fa6775488ab237a4537d49b92a8d52b0497b98 Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Wed, 21 Jan 2009 21:14:17 +0000 Subject: * refactor: Extract caps related code from scene and put into a region module * No functional changes in this revision --- OpenSim/Region/Environment/Scenes/ScenePresence.cs | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs') diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 2099e9a..02d3642 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs @@ -510,7 +510,7 @@ namespace OpenSim.Region.Environment.Scenes public void AdjustKnownSeeds() { - Dictionary seeds = Scene.GetChildrenSeeds(UUID); + Dictionary seeds = Scene.CapsModule.GetChildrenSeeds(UUID); List old = new List(); foreach (ulong handle in seeds.Keys) { @@ -524,7 +524,7 @@ namespace OpenSim.Region.Environment.Scenes } } DropOldNeighbours(old); - Scene.SetChildrenSeed(UUID, seeds); + Scene.CapsModule.SetChildrenSeed(UUID, seeds); KnownRegions = seeds; //Console.WriteLine(" ++++++++++AFTER+++++++++++++ "); //DumpKnownRegions(); @@ -848,8 +848,8 @@ namespace OpenSim.Region.Environment.Scenes //SendAnimPack(); m_scene.SwapRootAgentCount(false); - m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); - m_scene.AddCapsHandler(m_uuid); + m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); + m_scene.CapsModule.AddCapsHandler(m_uuid); // On the next prim update, all objects will be sent // @@ -969,7 +969,7 @@ namespace OpenSim.Region.Environment.Scenes foreach (ulong handle in oldRegions) { RemoveNeighbourRegion(handle); - Scene.DropChildSeed(UUID, handle); + Scene.CapsModule.DropChildSeed(UUID, handle); } } @@ -2494,14 +2494,13 @@ namespace OpenSim.Region.Environment.Scenes { // Restore the user structures that we needed to delete before asking the receiving region to complete the crossing m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(UUID); - m_scene.AddCapsHandler(UUID); + m_scene.CapsModule.AddCapsHandler(UUID); } } //Console.WriteLine("AFTER CROSS"); //Scene.DumpChildrenSeeds(UUID); //DumpKnownRegions(); - } /// -- cgit v1.1