diff options
author | Melanie | 2011-01-27 02:16:41 +0100 |
---|---|---|
committer | Melanie | 2011-01-27 02:16:41 +0100 |
commit | 11c742a5a8b1edd97923cc445aa43e0ba92f1bce (patch) | |
tree | 08221312c1d40942466d2e119be1f8103808a89b /OpenSim/Region/CoreModules/Framework | |
parent | Reproduce a corner case behavior for llListReplaceList (diff) | |
download | opensim-SC-11c742a5a8b1edd97923cc445aa43e0ba92f1bce.zip opensim-SC-11c742a5a8b1edd97923cc445aa43e0ba92f1bce.tar.gz opensim-SC-11c742a5a8b1edd97923cc445aa43e0ba92f1bce.tar.bz2 opensim-SC-11c742a5a8b1edd97923cc445aa43e0ba92f1bce.tar.xz |
Make bans work for teleport. Now teleport will complete block if the user
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index eb150d9..4bf2477 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -281,6 +281,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
281 | return; | 281 | return; |
282 | } | 282 | } |
283 | 283 | ||
284 | if (!m_aScene.SimulationService.QueryAccess(finalDestination, sp.ControllingClient.AgentId)) | ||
285 | { | ||
286 | sp.ControllingClient.SendTeleportFailed("The destination region has refused access"); | ||
287 | return; | ||
288 | } | ||
289 | |||
284 | sp.ControllingClient.SendTeleportStart(teleportFlags); | 290 | sp.ControllingClient.SendTeleportStart(teleportFlags); |
285 | 291 | ||
286 | // the avatar.Close below will clear the child region list. We need this below for (possibly) | 292 | // the avatar.Close below will clear the child region list. We need this below for (possibly) |