diff options
author | Oren Hurvitz | 2012-04-23 19:20:46 +0300 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-04-27 20:22:35 +0100 |
commit | 9622e8ac72d29b75b96d2dd481671b57d0a204bf (patch) | |
tree | b6fc23ad072190b1e260a7071e9b49b3f50f99ce /OpenSim/Region/CoreModules/Framework | |
parent | Use DotNetZip to compress OARs and IARs. (diff) | |
download | opensim-SC_OLD-9622e8ac72d29b75b96d2dd481671b57d0a204bf.zip opensim-SC_OLD-9622e8ac72d29b75b96d2dd481671b57d0a204bf.tar.gz opensim-SC_OLD-9622e8ac72d29b75b96d2dd481671b57d0a204bf.tar.bz2 opensim-SC_OLD-9622e8ac72d29b75b96d2dd481671b57d0a204bf.tar.xz |
If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.
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 a318a3c..779fd6b 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -161,6 +161,12 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
161 | 161 | ||
162 | public void Teleport(ScenePresence sp, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags) | 162 | public void Teleport(ScenePresence sp, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags) |
163 | { | 163 | { |
164 | if (sp.Scene.Permissions.IsGridGod(sp.UUID)) | ||
165 | { | ||
166 | // This user will be a God in the destination scene, too | ||
167 | teleportFlags |= (uint)TeleportFlags.Godlike; | ||
168 | } | ||
169 | |||
164 | if (!sp.Scene.Permissions.CanTeleport(sp.UUID)) | 170 | if (!sp.Scene.Permissions.CanTeleport(sp.UUID)) |
165 | return; | 171 | return; |
166 | 172 | ||