diff options
| author | Justin Clark-Casey (justincc) | 2014-01-10 20:19:38 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-10 20:19:38 +0000 |
| commit | 5e72de19088a753b0607454d59039d5b54f64695 (patch) | |
| tree | 59dab06d7a41aff10ba595f814caa9b1823564c6 /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'justincc-master' (diff) | |
| parent | When creating a coalesced object, set its permissions to the lowest-common-de... (diff) | |
| download | opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.zip opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.tar.gz opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.tar.bz2 opensim-SC-5e72de19088a753b0607454d59039d5b54f64695.tar.xz | |
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index 22a53a8..0cb574a 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
| @@ -198,13 +198,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
| 198 | item.InvType = (int)InventoryType.Object; | 198 | item.InvType = (int)InventoryType.Object; |
| 199 | item.Folder = categoryID; | 199 | item.Folder = categoryID; |
| 200 | 200 | ||
| 201 | uint nextPerms=(perms & 7) << 13; | 201 | PermissionsUtil.ApplyFoldedPermissions(perms, ref perms); |
| 202 | if ((nextPerms & (uint)PermissionMask.Copy) == 0) | ||
| 203 | perms &= ~(uint)PermissionMask.Copy; | ||
| 204 | if ((nextPerms & (uint)PermissionMask.Transfer) == 0) | ||
| 205 | perms &= ~(uint)PermissionMask.Transfer; | ||
| 206 | if ((nextPerms & (uint)PermissionMask.Modify) == 0) | ||
| 207 | perms &= ~(uint)PermissionMask.Modify; | ||
| 208 | 202 | ||
| 209 | item.BasePermissions = perms & part.NextOwnerMask; | 203 | item.BasePermissions = perms & part.NextOwnerMask; |
| 210 | item.CurrentPermissions = perms & part.NextOwnerMask; | 204 | item.CurrentPermissions = perms & part.NextOwnerMask; |