aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/Objects
diff options
context:
space:
mode:
authorUbitUmarov2017-04-29 23:09:32 +0100
committerUbitUmarov2017-04-29 23:09:32 +0100
commitfedd1a93d28c86459e66a05f8ce189498b7ab354 (patch)
tree93e3b740c247e768b0ea69658e20d4982460abc0 /OpenSim/Region/CoreModules/World/Objects
parent update folded permitions if taking from world, or after unfold (diff)
downloadopensim-SC_OLD-fedd1a93d28c86459e66a05f8ce189498b7ab354.zip
opensim-SC_OLD-fedd1a93d28c86459e66a05f8ce189498b7ab354.tar.gz
opensim-SC_OLD-fedd1a93d28c86459e66a05f8ce189498b7ab354.tar.bz2
opensim-SC_OLD-fedd1a93d28c86459e66a05f8ce189498b7ab354.tar.xz
buysell: fix permissions masks hierachy
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r--OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs18
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
index af53aa3..ca392b8 100644
--- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs
@@ -208,18 +208,20 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
208 208
209 perms = group.GetEffectivePermissions(false); 209 perms = group.GetEffectivePermissions(false);
210 210
211 PermissionsUtil.ApplyFoldedPermissions(perms, ref perms); 211 PermissionsUtil.ApplyNoModFoldedPermissions(perms, ref perms);
212 212
213 perms &= part.NextOwnerMask; 213 perms &= part.NextOwnerMask;
214 214
215 item.BasePermissions = PermissionsUtil.FixAndFoldPermissions(perms); 215 perms = PermissionsUtil.FixAndFoldPermissions(perms);
216 216
217 item.CurrentPermissions = item.BasePermissions; 217 item.BasePermissions = perms;
218 item.NextPermissions = part.NextOwnerMask; 218 item.CurrentPermissions = perms;
219 item.EveryOnePermissions = part.EveryoneMask & 219
220 part.NextOwnerMask; 220 perms &= part.NextOwnerMask;
221 item.GroupPermissions = part.GroupMask & 221 item.NextPermissions = perms;
222 part.NextOwnerMask; 222
223 item.EveryOnePermissions = part.EveryoneMask & perms;
224 item.GroupPermissions = part.GroupMask & perms;
223 item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; 225 item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
224 item.CreationDate = Util.UnixTimeSinceEpoch(); 226 item.CreationDate = Util.UnixTimeSinceEpoch();
225 227