diff options
| author | teravus | 2012-12-19 11:53:26 -0500 |
|---|---|---|
| committer | teravus | 2012-12-19 11:53:26 -0500 |
| commit | c648325d7c761beb2ebe0edff3a70fdfbc81ffdb (patch) | |
| tree | 831779e20f7c21037d2bfcb4dc1985412c364e6b /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | * This is a better way to do the last commit. (diff) | |
| parent | Add the interfaces for the new Avination baked texture cache service (diff) | |
| download | opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.zip opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.gz opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.bz2 opensim-SC-c648325d7c761beb2ebe0edff3a70fdfbc81ffdb.tar.xz | |
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index b9f9c86..4ad8b11 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3449,7 +3449,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3449 | part.ClonePermissions(RootPart); | 3449 | part.ClonePermissions(RootPart); |
| 3450 | }); | 3450 | }); |
| 3451 | 3451 | ||
| 3452 | RootPart.OwnerMask = newOwnerMask | foldedPerms; | 3452 | uint lockMask = ~(uint)PermissionMask.Move; |
| 3453 | uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move; | ||
| 3454 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); | ||
| 3453 | RootPart.ScheduleFullUpdate(); | 3455 | RootPart.ScheduleFullUpdate(); |
| 3454 | } | 3456 | } |
| 3455 | 3457 | ||