diff options
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/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs')
-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 28daf2f..d4e4c25 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -205,13 +205,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
205 | item.InvType = (int)InventoryType.Object; | 205 | item.InvType = (int)InventoryType.Object; |
206 | item.Folder = categoryID; | 206 | item.Folder = categoryID; |
207 | 207 | ||
208 | uint nextPerms=(perms & 7) << 13; | 208 | PermissionsUtil.ApplyFoldedPermissions(perms, ref perms); |
209 | if ((nextPerms & (uint)PermissionMask.Copy) == 0) | ||
210 | perms &= ~(uint)PermissionMask.Copy; | ||
211 | if ((nextPerms & (uint)PermissionMask.Transfer) == 0) | ||
212 | perms &= ~(uint)PermissionMask.Transfer; | ||
213 | if ((nextPerms & (uint)PermissionMask.Modify) == 0) | ||
214 | perms &= ~(uint)PermissionMask.Modify; | ||
215 | 209 | ||
216 | item.BasePermissions = perms & part.NextOwnerMask; | 210 | item.BasePermissions = perms & part.NextOwnerMask; |
217 | item.CurrentPermissions = perms & part.NextOwnerMask; | 211 | item.CurrentPermissions = perms & part.NextOwnerMask; |