diff options
Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -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 9306ace..7263b51 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -352,7 +352,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 352 | 352 | ||
| 353 | // the avatar.Close below will clear the child region list. We need this below for (possibly) | 353 | // the avatar.Close below will clear the child region list. We need this below for (possibly) |
| 354 | // closing the child agents, so save it here (we need a copy as it is Clear()-ed). | 354 | // closing the child agents, so save it here (we need a copy as it is Clear()-ed). |
| 355 | //List<ulong> childRegions = new List<ulong>(avatar.GetKnownRegionList()); | 355 | //List<ulong> childRegions = avatar.KnownRegionHandles; |
| 356 | // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport | 356 | // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport |
| 357 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail | 357 | // failure at this point (unlike a border crossing failure). So perhaps this can never fail |
| 358 | // once we reach here... | 358 | // once we reach here... |