diff options
| author | UbitUmarov | 2012-12-18 10:05:43 +0000 |
|---|---|---|
| committer | UbitUmarov | 2012-12-18 10:05:43 +0000 |
| commit | f185239fc3b45fe5186d76a1cc396cdd530309ea (patch) | |
| tree | 71d9fd7f1b9738ec2b09332e5d810d7d84c17d0c /OpenSim/Region/Framework/Scenes | |
| parent | Merge branch 'avination' into ubitwork (diff) | |
| parent | Fix locking for good (diff) | |
| download | opensim-SC-f185239fc3b45fe5186d76a1cc396cdd530309ea.zip opensim-SC-f185239fc3b45fe5186d76a1cc396cdd530309ea.tar.gz opensim-SC-f185239fc3b45fe5186d76a1cc396cdd530309ea.tar.bz2 opensim-SC-f185239fc3b45fe5186d76a1cc396cdd530309ea.tar.xz | |
Merge branch 'avination' into ubitwork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 0b974c6..4ad8b11 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3439,12 +3439,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3439 | 3439 | ||
| 3440 | public void AdjustChildPrimPermissions() | 3440 | public void AdjustChildPrimPermissions() |
| 3441 | { | 3441 | { |
| 3442 | //uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits | 3442 | uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits |
| 3443 | //uint foldedPerms = RootPart.OwnerMask & 3; | 3443 | uint foldedPerms = RootPart.OwnerMask & 3; |
| 3444 | 3444 | ||
| 3445 | ForEachPart(part => | 3445 | ForEachPart(part => |
| 3446 | { | 3446 | { |
| 3447 | //newOwnerMask &= part.BaseMask; | 3447 | newOwnerMask &= part.BaseMask; |
| 3448 | if (part != RootPart) | 3448 | if (part != RootPart) |
| 3449 | part.ClonePermissions(RootPart); | 3449 | part.ClonePermissions(RootPart); |
| 3450 | }); | 3450 | }); |