diff options
author | Melanie Thielker | 2017-01-06 13:17:43 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-06 13:17:43 +0000 |
commit | 4385d7d6934443530c1e14976e40f01dc90175bf (patch) | |
tree | 0d681647272df3422fff6d09f7d3f126f42a7b3d /OpenSim/ApplicationPlugins | |
parent | restore parcels avatars visibility god level change correct handling; try to... (diff) | |
download | opensim-SC_OLD-4385d7d6934443530c1e14976e40f01dc90175bf.zip opensim-SC_OLD-4385d7d6934443530c1e14976e40f01dc90175bf.tar.gz opensim-SC_OLD-4385d7d6934443530c1e14976e40f01dc90175bf.tar.bz2 opensim-SC_OLD-4385d7d6934443530c1e14976e40f01dc90175bf.tar.xz |
Fix errors introduced by incomplete understanding of what folded perms are
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index a5c9fb4..597b439 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -3053,11 +3053,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
3053 | { | 3053 | { |
3054 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) | 3054 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) |
3055 | { | 3055 | { |
3056 | uint perms = item.CurrentPermissions; | 3056 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) |
3057 | PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms); | 3057 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; |
3058 | item.CurrentPermissions = perms; | 3058 | if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) |
3059 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; | ||
3060 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) | ||
3061 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; | ||
3059 | } | 3062 | } |
3060 | |||
3061 | item.CurrentPermissions &= item.NextPermissions; | 3063 | item.CurrentPermissions &= item.NextPermissions; |
3062 | item.BasePermissions &= item.NextPermissions; | 3064 | item.BasePermissions &= item.NextPermissions; |
3063 | item.EveryOnePermissions &= item.NextPermissions; | 3065 | item.EveryOnePermissions &= item.NextPermissions; |