Remove the last instance of the legacy slam but being set

New objects now get only the real slam bit.
This commit is contained in:
Melanie Thielker
2017-01-16 14:53:42 +00:00
parent e475e65828
commit 568614af2c
4 changed files with 17 additions and 7 deletions

View File

@@ -608,7 +608,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// item.BasePermissions = perms & so.RootPart.NextOwnerMask;
uint nextp = so.RootPart.NextOwnerMask | 0x0f;
uint nextp = so.RootPart.NextOwnerMask | (uint)PermissionMask.FoldedMask;
item.BasePermissions = perms & nextp;
item.CurrentPermissions = item.BasePermissions;
item.NextPermissions = perms & so.RootPart.NextOwnerMask;
@@ -616,7 +616,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
item.GroupPermissions = so.RootPart.GroupMask & so.RootPart.NextOwnerMask;
// apply next owner perms on rez
item.CurrentPermissions |= (uint)PermissionMask.Slam;
item.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
}
else
{