diff options
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 6e5a4a5..5aad7f0 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -47,6 +47,7 @@ using OpenMetaverse; | |||
47 | using log4net; | 47 | using log4net; |
48 | using Nini.Config; | 48 | using Nini.Config; |
49 | using Mono.Addins; | 49 | using Mono.Addins; |
50 | using PermissionMask = OpenSim.Framework.PermissionMask; | ||
50 | 51 | ||
51 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | 52 | namespace OpenSim.Region.CoreModules.Framework.InventoryAccess |
52 | { | 53 | { |
@@ -398,7 +399,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
398 | objectGroup.RootPart.NextOwnerMask &= | 399 | objectGroup.RootPart.NextOwnerMask &= |
399 | ((uint)PermissionMask.Copy | | 400 | ((uint)PermissionMask.Copy | |
400 | (uint)PermissionMask.Transfer | | 401 | (uint)PermissionMask.Transfer | |
401 | (uint)PermissionMask.Modify); | 402 | (uint)PermissionMask.Modify | |
403 | (uint)PermissionMask.Export); | ||
402 | objectGroup.RootPart.NextOwnerMask |= | 404 | objectGroup.RootPart.NextOwnerMask |= |
403 | (uint)PermissionMask.Move; | 405 | (uint)PermissionMask.Move; |
404 | 406 | ||
@@ -506,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
506 | InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, | 508 | InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, |
507 | IClientAPI remoteClient) | 509 | IClientAPI remoteClient) |
508 | { | 510 | { |
509 | uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7; | 511 | uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7; |
510 | // For the porposes of inventory, an object is modify if the prims | 512 | // For the porposes of inventory, an object is modify if the prims |
511 | // are modify. This allows renaming an object that contains no | 513 | // are modify. This allows renaming an object that contains no |
512 | // mod items. | 514 | // mod items. |
@@ -555,6 +557,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
555 | (uint)PermissionMask.Transfer | | 557 | (uint)PermissionMask.Transfer | |
556 | (uint)PermissionMask.Modify | | 558 | (uint)PermissionMask.Modify | |
557 | (uint)PermissionMask.Move | | 559 | (uint)PermissionMask.Move | |
560 | (uint)PermissionMask.Export | | ||
558 | 7); // Preserve folded permissions | 561 | 7); // Preserve folded permissions |
559 | } | 562 | } |
560 | 563 | ||