aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorThomas Grimshaw2010-03-17 17:42:33 +0100
committerThomas Grimshaw2010-03-17 17:42:33 +0100
commite442c2a3f9dc1823c00ddc1c81802fdabd7883dc (patch)
tree169af9160ec37948a5a5fa8cd69ec873b144b022 /OpenSim
parentDebugger tags for VS2010 (diff)
downloadopensim-SC-e442c2a3f9dc1823c00ddc1c81802fdabd7883dc.zip
opensim-SC-e442c2a3f9dc1823c00ddc1c81802fdabd7883dc.tar.gz
opensim-SC-e442c2a3f9dc1823c00ddc1c81802fdabd7883dc.tar.bz2
opensim-SC-e442c2a3f9dc1823c00ddc1c81802fdabd7883dc.tar.xz
Prevent llTeleportAgentHome from affecting gods
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 485a3b5..10ebf67 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4193,6 +4193,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4193 ScenePresence presence = World.GetScenePresence(agentId); 4193 ScenePresence presence = World.GetScenePresence(agentId);
4194 if (presence != null) 4194 if (presence != null)
4195 { 4195 {
4196 // agent must not be a god
4197 if (presence.GodLevel >= 200) return;
4198
4196 // agent must be over the owners land 4199 // agent must be over the owners land
4197 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4200 if (m_host.OwnerID == World.LandChannel.GetLandObject(
4198 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID) 4201 presence.AbsolutePosition.X, presence.AbsolutePosition.Y).LandData.OwnerID)