diff options
| author | UbitUmarov | 2012-03-15 04:20:19 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-03-15 04:20:19 +0000 |
| commit | 051ea18a4f0ceca3e3350f8d8bd2193ea24afcc9 (patch) | |
| tree | b742b6b8d9951343756550e2673556c65075018d /OpenSim/Region | |
| parent | added ObjectPhysicsProperties http event message to send viewer that data. F... (diff) | |
| parent | Allow llTeleportAgent to teleport gods when not in god mode (diff) | |
| download | opensim-SC-051ea18a4f0ceca3e3350f8d8bd2193ea24afcc9.zip opensim-SC-051ea18a4f0ceca3e3350f8d8bd2193ea24afcc9.tar.gz opensim-SC-051ea18a4f0ceca3e3350f8d8bd2193ea24afcc9.tar.bz2 opensim-SC-051ea18a4f0ceca3e3350f8d8bd2193ea24afcc9.tar.xz | |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
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( |