aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-03-14 19:21:25 +0100
committerMelanie2012-03-14 19:21:25 +0100
commitd1daea0108a9d18876426c608ad6ea70d10c48ac (patch)
tree66cd189dc2289c8df3b06510e59b7182afb20b8d
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-d1daea0108a9d18876426c608ad6ea70d10c48ac.zip
opensim-SC-d1daea0108a9d18876426c608ad6ea70d10c48ac.tar.gz
opensim-SC-d1daea0108a9d18876426c608ad6ea70d10c48ac.tar.bz2
opensim-SC-d1daea0108a9d18876426c608ad6ea70d10c48ac.tar.xz
Allow llTeleportAgent to teleport gods when not in god mode
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index fd4c7ad..df4c7f8 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4678,7 +4678,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4678 if (presence != null && presence.PresenceType != PresenceType.Npc) 4678 if (presence != null && presence.PresenceType != PresenceType.Npc)
4679 { 4679 {
4680 // agent must not be a god 4680 // agent must not be a god
4681 if (presence.UserLevel >= 200) return; 4681 if (presence.GodLevel >= 200) return;
4682 4682
4683 // agent must be over the owners land 4683 // agent must be over the owners land
4684 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4684 if (m_host.OwnerID == World.LandChannel.GetLandObject(