Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2012-12-18 09:48:12 +00:00
28 changed files with 1445 additions and 604 deletions

View File

@@ -3457,7 +3457,9 @@ namespace OpenSim.Region.Framework.Scenes
part.ClonePermissions(RootPart);
});
RootPart.OwnerMask = newOwnerMask | foldedPerms;
uint lockMask = ~(uint)PermissionMask.Move;
uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move;
RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
RootPart.ScheduleFullUpdate();
}