diff options
author | UbitUmarov | 2017-01-07 19:42:58 +0000 |
---|---|---|
committer | UbitUmarov | 2017-01-07 19:44:37 +0000 |
commit | c41616b7711d3c2ab91ae0b8a06e22d8bfd5e0aa (patch) | |
tree | dde33a9678d1a2fb3154d002855f799a94bc9a29 /OpenSim/Region/Framework/Scenes | |
parent | missing changed file (diff) | |
download | opensim-SC-c41616b7711d3c2ab91ae0b8a06e22d8bfd5e0aa.zip opensim-SC-c41616b7711d3c2ab91ae0b8a06e22d8bfd5e0aa.tar.gz opensim-SC-c41616b7711d3c2ab91ae0b8a06e22d8bfd5e0aa.tar.bz2 opensim-SC-c41616b7711d3c2ab91ae0b8a06e22d8bfd5e0aa.tar.xz |
ignore teleport flag GodLike. Perform checks acording to agent static
local or grid rights
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Framework/Scenes/Scene.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 87c3049..2137b42 100755 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -3951,7 +3951,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3951 | bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 || | 3951 | bool vialogin = ((teleportFlags & (uint)TPFlags.ViaLogin) != 0 || |
3952 | (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0); | 3952 | (teleportFlags & (uint)TPFlags.ViaHGLogin) != 0); |
3953 | bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0); | 3953 | bool viahome = ((teleportFlags & (uint)TPFlags.ViaHome) != 0); |
3954 | bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0); | 3954 | // bool godlike = ((teleportFlags & (uint)TPFlags.Godlike) != 0); |
3955 | 3955 | ||
3956 | reason = String.Empty; | 3956 | reason = String.Empty; |
3957 | 3957 | ||
@@ -4251,7 +4251,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4251 | } | 4251 | } |
4252 | // only check access, actual relocations will happen later on ScenePresence MakeRoot | 4252 | // only check access, actual relocations will happen later on ScenePresence MakeRoot |
4253 | // allow child agents creation | 4253 | // allow child agents creation |
4254 | if(!godlike && teleportFlags != (uint) TPFlags.Default) | 4254 | // if(!godlike && teleportFlags != (uint) TPFlags.Default) |
4255 | if(teleportFlags != (uint) TPFlags.Default) | ||
4255 | { | 4256 | { |
4256 | bool checkTeleHub; | 4257 | bool checkTeleHub; |
4257 | 4258 | ||
@@ -6188,9 +6189,10 @@ Environment.Exit(1); | |||
6188 | if (Permissions.IsGod(agentID)) | 6189 | if (Permissions.IsGod(agentID)) |
6189 | return true; | 6190 | return true; |
6190 | 6191 | ||
6191 | bool isAdmin = Permissions.IsAdministrator(agentID); | 6192 | // Permissions.IsAdministrator is the same as IsGod for now |
6192 | if(isAdmin) | 6193 | // bool isAdmin = Permissions.IsAdministrator(agentID); |
6193 | return true; | 6194 | // if(isAdmin) |
6195 | // return true; | ||
6194 | 6196 | ||
6195 | // also honor estate managers access rights | 6197 | // also honor estate managers access rights |
6196 | bool isManager = Permissions.IsEstateManager(agentID); | 6198 | bool isManager = Permissions.IsEstateManager(agentID); |