diff options
author | Diva Canto | 2013-05-20 09:26:15 -0700 |
---|---|---|
committer | Diva Canto | 2013-05-20 09:26:15 -0700 |
commit | 10e4fb2ce26c428fb1fe309093e3962bae01bc74 (patch) | |
tree | ba1fc4db5c342d57461edd9917d42fdb584b8202 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Add comment (diff) | |
parent | fix error in hull point indexing (diff) | |
download | opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.zip opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.tar.gz opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.tar.bz2 opensim-SC-10e4fb2ce26c428fb1fe309093e3962bae01bc74.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 6bbcbd7..8fe9b66 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3435,15 +3435,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
3435 | if (closeChildAgents && CapsModule != null) | 3435 | if (closeChildAgents && CapsModule != null) |
3436 | CapsModule.RemoveCaps(agentID); | 3436 | CapsModule.RemoveCaps(agentID); |
3437 | 3437 | ||
3438 | // // REFACTORING PROBLEM -- well not really a problem, but just to point out that whatever | ||
3439 | // // this method is doing is HORRIBLE!!! | ||
3440 | // Commented pending deletion since this method no longer appears to do anything at all | ||
3441 | // avatar.Scene.NeedSceneCacheClear(avatar.UUID); | ||
3442 | |||
3443 | if (closeChildAgents && !isChildAgent) | 3438 | if (closeChildAgents && !isChildAgent) |
3444 | { | 3439 | { |
3445 | List<ulong> regions = avatar.KnownRegionHandles; | 3440 | List<ulong> regions = avatar.KnownRegionHandles; |
3446 | regions.Remove(RegionInfo.RegionHandle); | 3441 | regions.Remove(RegionInfo.RegionHandle); |
3442 | |||
3443 | // This ends up being done asynchronously so that a logout isn't held up where there are many present but unresponsive neighbours. | ||
3447 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); | 3444 | m_sceneGridService.SendCloseChildAgentConnections(agentID, regions); |
3448 | } | 3445 | } |
3449 | 3446 | ||