rename sog.GetEffectivePermissions() since its use is now limited to more specific task, and no longer on current effective(full) path. Note that change ownermask start to be current ownermask, and filter it to all parts basemask

This commit is contained in:
UbitUmarov
2017-05-01 14:18:59 +01:00
parent 2dbf96593c
commit 60dc124872
3 changed files with 13 additions and 25 deletions

View File

@@ -484,7 +484,7 @@ namespace OpenSim.Region.Framework.Scenes
}
}
public uint GetEffectivePermissions(bool useBase)
public uint CurrentAndFoldedNextPermissions()
{
uint perms=(uint)(PermissionMask.Modify |
PermissionMask.Copy |
@@ -492,18 +492,13 @@ namespace OpenSim.Region.Framework.Scenes
PermissionMask.Transfer |
PermissionMask.FoldedMask);
uint ownerMask = 0x7fffffff;
uint ownerMask = RootPart.OwnerMask;
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
{
SceneObjectPart part = parts[i];
if (useBase)
ownerMask &= part.BaseMask;
else
ownerMask &= part.OwnerMask;
ownerMask &= part.BaseMask;
perms &= part.Inventory.MaskEffectivePermissions();
}