diff options
| author | Melanie | 2012-12-17 01:59:50 +0100 |
|---|---|---|
| committer | Melanie | 2012-12-17 01:59:50 +0100 |
| commit | a5781ea9fca2d35afa2f56cb468b827d4943c4c4 (patch) | |
| tree | 39580fcc0de85829e7d7ae71d861644c4d211268 | |
| parent | Fix locking objects (diff) | |
| parent | * Fix for Prim Locking. Prior to the merge, it was just a clone of the root... (diff) | |
| download | opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.zip opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.tar.gz opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.tar.bz2 opensim-SC_OLD-a5781ea9fca2d35afa2f56cb468b827d4943c4c4.tar.xz | |
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| -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 4ad8b11..0b974c6 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 | }); |