aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorUbitUmarov2017-04-29 23:59:56 +0100
committerUbitUmarov2017-04-29 23:59:56 +0100
commitd8341588b3b7d855c381831ddf6ca5656a6be9c3 (patch)
treefe25b79ffb8e41541eaaf004729110ef6e5beb06 /OpenSim/Region/CoreModules/Framework
parentbuysell: fix permissions masks hierachy (diff)
downloadopensim-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/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs8
1 files changed, 4 insertions, 4 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;