aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-03-01 23:34:02 +0100
committerMelanie2011-03-01 23:34:02 +0100
commit0719ffa6fab128352868b65a4ec48e40357ecc5f (patch)
tree92f126795617a8b2ba2de9e74d4dcc36426eaf99 /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-0719ffa6fab128352868b65a4ec48e40357ecc5f.zip
opensim-SC_OLD-0719ffa6fab128352868b65a4ec48e40357ecc5f.tar.gz
opensim-SC_OLD-0719ffa6fab128352868b65a4ec48e40357ecc5f.tar.bz2
opensim-SC_OLD-0719ffa6fab128352868b65a4ec48e40357ecc5f.tar.xz
Change protection from being teleported home to extend to incognito gods.
Diffstat (limited to 'OpenSim')
-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 a62a7b4..559523b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4486,7 +4486,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
4486 if (presence != null) 4486 if (presence != null)
4487 { 4487 {
4488 // agent must not be a god 4488 // agent must not be a god
4489 if (presence.GodLevel >= 200) return; 4489 if (presence.UserLevel >= 200) return;
4490 4490
4491 // agent must be over the owners land 4491 // agent must be over the owners land
4492 if (m_host.OwnerID == World.LandChannel.GetLandObject( 4492 if (m_host.OwnerID == World.LandChannel.GetLandObject(