* Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts.

avinationmerge
teravus 2012-12-15 16:26:03 -05:00
parent 1d713bcdb8
commit d2695cb3f7
1 changed files with 4 additions and 4 deletions

View File

@ -3439,17 +3439,17 @@ namespace OpenSim.Region.Framework.Scenes
public void AdjustChildPrimPermissions() public void AdjustChildPrimPermissions()
{ {
uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits //uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits
uint foldedPerms = RootPart.OwnerMask & 3; //uint foldedPerms = RootPart.OwnerMask & 3;
ForEachPart(part => ForEachPart(part =>
{ {
newOwnerMask &= part.BaseMask; //newOwnerMask &= part.BaseMask;
if (part != RootPart) if (part != RootPart)
part.ClonePermissions(RootPart); part.ClonePermissions(RootPart);
}); });
RootPart.OwnerMask = newOwnerMask | foldedPerms; //RootPart.OwnerMask = newOwnerMask | foldedPerms;
RootPart.ScheduleFullUpdate(); RootPart.ScheduleFullUpdate();
} }