diff options
author | UbitUmarov | 2017-04-29 23:59:56 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-29 23:59:56 +0100 |
commit | d8341588b3b7d855c381831ddf6ca5656a6be9c3 (patch) | |
tree | fe25b79ffb8e41541eaaf004729110ef6e5beb06 /OpenSim/Region/CoreModules | |
parent | buysell: fix permissions masks hierachy (diff) | |
download | opensim-SC_OLD-d8341588b3b7d855c381831ddf6ca5656a6be9c3.zip opensim-SC_OLD-d8341588b3b7d855c381831ddf6ca5656a6be9c3.tar.gz opensim-SC_OLD-d8341588b3b7d855c381831ddf6ca5656a6be9c3.tar.bz2 opensim-SC_OLD-d8341588b3b7d855c381831ddf6ca5656a6be9c3.tar.xz |
nore permissions masks hierachy
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 8 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 6 |
2 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index d4f9c16..a32d7dc 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -597,10 +597,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
597 | basePerms = PermissionsUtil.FixAndFoldPermissions(basePerms); | 597 | basePerms = PermissionsUtil.FixAndFoldPermissions(basePerms); |
598 | 598 | ||
599 | item.BasePermissions = basePerms; | 599 | item.BasePermissions = basePerms; |
600 | item.CurrentPermissions = item.BasePermissions; | 600 | item.CurrentPermissions = basePerms; |
601 | item.NextPermissions = effectivePerms & so.RootPart.NextOwnerMask; | 601 | item.NextPermissions = basePerms & so.RootPart.NextOwnerMask; |
602 | item.EveryOnePermissions = so.RootPart.EveryoneMask & so.RootPart.NextOwnerMask; | 602 | item.EveryOnePermissions = basePerms & so.RootPart.EveryoneMask; |
603 | item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask; | 603 | item.GroupPermissions = basePerms & so.RootPart.GroupMask; |
604 | 604 | ||
605 | // apply next owner perms on rez | 605 | // apply next owner perms on rez |
606 | item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; | 606 | item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; |
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index ca392b8..6854b53 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -216,12 +216,10 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
216 | 216 | ||
217 | item.BasePermissions = perms; | 217 | item.BasePermissions = perms; |
218 | item.CurrentPermissions = perms; | 218 | item.CurrentPermissions = perms; |
219 | 219 | item.NextPermissions = part.NextOwnerMask & perms; | |
220 | perms &= part.NextOwnerMask; | ||
221 | item.NextPermissions = perms; | ||
222 | |||
223 | item.EveryOnePermissions = part.EveryoneMask & perms; | 220 | item.EveryOnePermissions = part.EveryoneMask & perms; |
224 | item.GroupPermissions = part.GroupMask & perms; | 221 | item.GroupPermissions = part.GroupMask & perms; |
222 | |||
225 | item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; | 223 | item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; |
226 | item.CreationDate = Util.UnixTimeSinceEpoch(); | 224 | item.CreationDate = Util.UnixTimeSinceEpoch(); |
227 | 225 | ||