diff options
author | Justin Clarke Casey | 2009-01-21 21:14:17 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-01-21 21:14:17 +0000 |
commit | 37fa6775488ab237a4537d49b92a8d52b0497b98 (patch) | |
tree | 805183f2f807a8a051ba64878c079fb0a8c7fe17 /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
parent | * Restore commented out isdone assertions in TextureSendTests.T010_SendPkg() (diff) | |
download | opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.zip opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.gz opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.bz2 opensim-SC-37fa6775488ab237a4537d49b92a8d52b0497b98.tar.xz |
* refactor: Extract caps related code from scene and put into a region module
* No functional changes in this revision
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 13 |
1 files changed, 6 insertions, 7 deletions
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 | |||
510 | 510 | ||
511 | public void AdjustKnownSeeds() | 511 | public void AdjustKnownSeeds() |
512 | { | 512 | { |
513 | Dictionary<ulong, string> seeds = Scene.GetChildrenSeeds(UUID); | 513 | Dictionary<ulong, string> seeds = Scene.CapsModule.GetChildrenSeeds(UUID); |
514 | List<ulong> old = new List<ulong>(); | 514 | List<ulong> old = new List<ulong>(); |
515 | foreach (ulong handle in seeds.Keys) | 515 | foreach (ulong handle in seeds.Keys) |
516 | { | 516 | { |
@@ -524,7 +524,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
524 | } | 524 | } |
525 | } | 525 | } |
526 | DropOldNeighbours(old); | 526 | DropOldNeighbours(old); |
527 | Scene.SetChildrenSeed(UUID, seeds); | 527 | Scene.CapsModule.SetChildrenSeed(UUID, seeds); |
528 | KnownRegions = seeds; | 528 | KnownRegions = seeds; |
529 | //Console.WriteLine(" ++++++++++AFTER+++++++++++++ "); | 529 | //Console.WriteLine(" ++++++++++AFTER+++++++++++++ "); |
530 | //DumpKnownRegions(); | 530 | //DumpKnownRegions(); |
@@ -848,8 +848,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
848 | //SendAnimPack(); | 848 | //SendAnimPack(); |
849 | 849 | ||
850 | m_scene.SwapRootAgentCount(false); | 850 | m_scene.SwapRootAgentCount(false); |
851 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); | 851 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid); |
852 | m_scene.AddCapsHandler(m_uuid); | 852 | m_scene.CapsModule.AddCapsHandler(m_uuid); |
853 | 853 | ||
854 | // On the next prim update, all objects will be sent | 854 | // On the next prim update, all objects will be sent |
855 | // | 855 | // |
@@ -969,7 +969,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
969 | foreach (ulong handle in oldRegions) | 969 | foreach (ulong handle in oldRegions) |
970 | { | 970 | { |
971 | RemoveNeighbourRegion(handle); | 971 | RemoveNeighbourRegion(handle); |
972 | Scene.DropChildSeed(UUID, handle); | 972 | Scene.CapsModule.DropChildSeed(UUID, handle); |
973 | } | 973 | } |
974 | } | 974 | } |
975 | 975 | ||
@@ -2494,14 +2494,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
2494 | { | 2494 | { |
2495 | // Restore the user structures that we needed to delete before asking the receiving region to complete the crossing | 2495 | // Restore the user structures that we needed to delete before asking the receiving region to complete the crossing |
2496 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(UUID); | 2496 | m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(UUID); |
2497 | m_scene.AddCapsHandler(UUID); | 2497 | m_scene.CapsModule.AddCapsHandler(UUID); |
2498 | } | 2498 | } |
2499 | } | 2499 | } |
2500 | 2500 | ||
2501 | //Console.WriteLine("AFTER CROSS"); | 2501 | //Console.WriteLine("AFTER CROSS"); |
2502 | //Scene.DumpChildrenSeeds(UUID); | 2502 | //Scene.DumpChildrenSeeds(UUID); |
2503 | //DumpKnownRegions(); | 2503 | //DumpKnownRegions(); |
2504 | |||
2505 | } | 2504 | } |
2506 | 2505 | ||
2507 | /// <summary> | 2506 | /// <summary> |