diff options
author | Melanie Thielker | 2017-01-06 00:55:14 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-06 00:55:14 +0000 |
commit | ad8915f154d2ce6ba1b3a021b1725a0b0a671635 (patch) | |
tree | 431a20d28837bc3b002dcb65b60450729eb5ed8a /OpenSim/Region/CoreModules/World/Land | |
parent | Add GodController class (diff) | |
download | opensim-SC-ad8915f154d2ce6ba1b3a021b1725a0b0a671635.zip opensim-SC-ad8915f154d2ce6ba1b3a021b1725a0b0a671635.tar.gz opensim-SC-ad8915f154d2ce6ba1b3a021b1725a0b0a671635.tar.bz2 opensim-SC-ad8915f154d2ce6ba1b3a021b1725a0b0a671635.tar.xz |
Restructure god level and permissions
Create a class GodController which controls all aspects of god level,
viewer modes and user levels at ScenePresence level.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 63b8de0..3a8d6b7 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | |||
@@ -1977,7 +1977,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
1977 | ScenePresence SP; | 1977 | ScenePresence SP; |
1978 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP); | 1978 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out SP); |
1979 | List<SceneObjectGroup> returns = new List<SceneObjectGroup>(); | 1979 | List<SceneObjectGroup> returns = new List<SceneObjectGroup>(); |
1980 | if (SP.UserLevel != 0) | 1980 | if (SP.GodController.UserLevel != 0) |
1981 | { | 1981 | { |
1982 | if (flags == 0) //All parcels, scripted or not | 1982 | if (flags == 0) //All parcels, scripted or not |
1983 | { | 1983 | { |
@@ -2043,7 +2043,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
2043 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager); | 2043 | ((Scene)client.Scene).TryGetScenePresence(client.AgentId, out parcelManager); |
2044 | System.Threading.Timer Timer; | 2044 | System.Threading.Timer Timer; |
2045 | 2045 | ||
2046 | if (targetAvatar.UserLevel == 0) | 2046 | if (targetAvatar.GodController.UserLevel == 0) |
2047 | { | 2047 | { |
2048 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); | 2048 | ILandObject land = ((Scene)client.Scene).LandChannel.GetLandObject(targetAvatar.AbsolutePosition.X, targetAvatar.AbsolutePosition.Y); |
2049 | if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze, true)) | 2049 | if (!((Scene)client.Scene).Permissions.CanEditParcelProperties(client.AgentId, land, GroupPowers.LandEjectAndFreeze, true)) |