diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 8b7c16e..eaf4ce2 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 | { |
@@ -377,7 +378,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
377 | objectGroup.RootPart.NextOwnerMask &= | 378 | objectGroup.RootPart.NextOwnerMask &= |
378 | ((uint)PermissionMask.Copy | | 379 | ((uint)PermissionMask.Copy | |
379 | (uint)PermissionMask.Transfer | | 380 | (uint)PermissionMask.Transfer | |
380 | (uint)PermissionMask.Modify); | 381 | (uint)PermissionMask.Modify | |
382 | (uint)PermissionMask.Export); | ||
381 | objectGroup.RootPart.NextOwnerMask |= | 383 | objectGroup.RootPart.NextOwnerMask |= |
382 | (uint)PermissionMask.Move; | 384 | (uint)PermissionMask.Move; |
383 | 385 | ||
@@ -485,7 +487,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
485 | InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, | 487 | InventoryItemBase item, SceneObjectGroup so, List<SceneObjectGroup> objsForEffectivePermissions, |
486 | IClientAPI remoteClient) | 488 | IClientAPI remoteClient) |
487 | { | 489 | { |
488 | uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move) | 7; | 490 | uint effectivePerms = (uint)(PermissionMask.Copy | PermissionMask.Transfer | PermissionMask.Modify | PermissionMask.Move | PermissionMask.Export) | 7; |
489 | foreach (SceneObjectGroup grp in objsForEffectivePermissions) | 491 | foreach (SceneObjectGroup grp in objsForEffectivePermissions) |
490 | effectivePerms &= grp.GetEffectivePermissions(); | 492 | effectivePerms &= grp.GetEffectivePermissions(); |
491 | effectivePerms |= (uint)PermissionMask.Move; | 493 | effectivePerms |= (uint)PermissionMask.Move; |
@@ -525,6 +527,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
525 | (uint)PermissionMask.Transfer | | 527 | (uint)PermissionMask.Transfer | |
526 | (uint)PermissionMask.Modify | | 528 | (uint)PermissionMask.Modify | |
527 | (uint)PermissionMask.Move | | 529 | (uint)PermissionMask.Move | |
530 | (uint)PermissionMask.Export | | ||
528 | 7); // Preserve folded permissions | 531 | 7); // Preserve folded permissions |
529 | } | 532 | } |
530 | 533 | ||
@@ -1150,4 +1153,4 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
1150 | 1153 | ||
1151 | #endregion | 1154 | #endregion |
1152 | } | 1155 | } |
1153 | } \ No newline at end of file | 1156 | } |