diff options
| author | Dan Lake | 2011-10-06 22:47:33 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-10-06 22:47:33 -0700 |
| commit | 4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e (patch) | |
| tree | dc2b8f85bebe216378d54dab9410f0a8805145cf /OpenSim/Region/CoreModules/Framework | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e.zip opensim-SC_OLD-4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e.tar.gz opensim-SC_OLD-4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e.tar.bz2 opensim-SC_OLD-4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e.tar.xz | |
Refactored "known child region" in ScenePresence. There were 4 different
ways to access the list/dictionary of child regions and locking was
inconsistent. There are now public properties which enforce locks.
Callers are no longer required to create new copies of lists.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 083ee33..f4d2fda 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -351,7 +351,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 351 | 351 | ||
| 352 | // the avatar.Close below will clear the child region list. We need this below for (possibly) | 352 | // the avatar.Close below will clear the child region list. We need this below for (possibly) |
| 353 | // closing the child agents, so save it here (we need a copy as it is Clear()-ed). | 353 | // closing the child agents, so save it here (we need a copy as it is Clear()-ed). |
| 354 | //List<ulong> childRegions = new List<ulong>(avatar.GetKnownRegionList()); | 354 | //List<ulong> childRegions = avatar.KnownRegionHandles; |
| 355 | // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport | 355 | // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport |
| 356 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail | 356 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail |
| 357 | // once we reach here... | 357 | // once we reach here... |