diff options
author | Melanie | 2014-01-28 20:47:36 +0000 |
---|---|---|
committer | Melanie | 2014-01-28 20:47:36 +0000 |
commit | 4ccb15290ea9686070311c8a62c0fd9e6b0787d8 (patch) | |
tree | 5c4f69879983e87f567e11c59d8d8b83d0bd7bb4 /OpenSim/ApplicationPlugins/RemoteController | |
parent | Remove the core module extra profile settings support carried in with the latest (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.zip opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.gz opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.bz2 opensim-SC_OLD-4ccb15290ea9686070311c8a62c0fd9e6b0787d8.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/ApplicationPlugins/RemoteController')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 5453420..cf2e037 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -2942,15 +2942,13 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
2942 | /// </summary> | 2942 | /// </summary> |
2943 | private void ApplyNextOwnerPermissions(InventoryItemBase item) | 2943 | private void ApplyNextOwnerPermissions(InventoryItemBase item) |
2944 | { | 2944 | { |
2945 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) | 2945 | if (item.InvType == (int)InventoryType.Object) |
2946 | { | 2946 | { |
2947 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) | 2947 | uint perms = item.CurrentPermissions; |
2948 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; | 2948 | PermissionsUtil.ApplyFoldedPermissions(item.CurrentPermissions, ref perms); |
2949 | if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) | 2949 | item.CurrentPermissions = perms; |
2950 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; | ||
2951 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) | ||
2952 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; | ||
2953 | } | 2950 | } |
2951 | |||
2954 | item.CurrentPermissions &= item.NextPermissions; | 2952 | item.CurrentPermissions &= item.NextPermissions; |
2955 | item.BasePermissions &= item.NextPermissions; | 2953 | item.BasePermissions &= item.NextPermissions; |
2956 | item.EveryOnePermissions &= item.NextPermissions; | 2954 | item.EveryOnePermissions &= item.NextPermissions; |