aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController
diff options
context:
space:
mode:
authorUbitUmarov2017-04-29 19:07:04 +0100
committerUbitUmarov2017-04-29 19:07:04 +0100
commit04117d9f75ca278a921be9ce09c8c859f81cd428 (patch)
tree3a919f3e3d2eb3c0ea22bcb7fefa9fdd5e0541e0 /OpenSim/ApplicationPlugins/RemoteController
parentadd check for valid folded perms (diff)
downloadopensim-SC_OLD-04117d9f75ca278a921be9ce09c8c859f81cd428.zip
opensim-SC_OLD-04117d9f75ca278a921be9ce09c8c859f81cd428.tar.gz
opensim-SC_OLD-04117d9f75ca278a921be9ce09c8c859f81cd428.tar.bz2
opensim-SC_OLD-04117d9f75ca278a921be9ce09c8c859f81cd428.tar.xz
recover PermissionsUtil.ApplyFoldedPermissions (well my version). its use easys code readability
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs12
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 1ee2468..510905f 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -3087,15 +3087,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController
3087 /// </summary> 3087 /// </summary>
3088 private void ApplyNextOwnerPermissions(InventoryItemBase item) 3088 private void ApplyNextOwnerPermissions(InventoryItemBase item)
3089 { 3089 {
3090 if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) 3090 if (item.InvType == (int)InventoryType.Object)
3091 { 3091 {
3092 if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) 3092 uint perms = item.CurrentPermissions;
3093 item.CurrentPermissions &= ~(uint)PermissionMask.Copy; 3093 PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms);
3094 if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) 3094 item.CurrentPermissions = perms;
3095 item.CurrentPermissions &= ~(uint)PermissionMask.Transfer;
3096 if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0)
3097 item.CurrentPermissions &= ~(uint)PermissionMask.Modify;
3098 } 3095 }
3096
3099 item.CurrentPermissions &= item.NextPermissions; 3097 item.CurrentPermissions &= item.NextPermissions;
3100 item.BasePermissions &= item.NextPermissions; 3098 item.BasePermissions &= item.NextPermissions;
3101 item.EveryOnePermissions &= item.NextPermissions; 3099 item.EveryOnePermissions &= item.NextPermissions;