diff options
| author | Melanie | 2012-12-18 09:48:12 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:48:12 +0000 |
| commit | 79bdf464d3f123f8e195fa57c497e546b7d9dfcc (patch) | |
| tree | bf6123b15d1ced7ec72ce871e4801d6645bb23f4 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix locking for good (diff) | |
| download | opensim-SC_OLD-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.zip opensim-SC_OLD-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.gz opensim-SC_OLD-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.bz2 opensim-SC_OLD-79bdf464d3f123f8e195fa57c497e546b7d9dfcc.tar.xz | |
Merge branch 'avination' into careminster
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 bc62d51..2051a53 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3457,7 +3457,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3457 | part.ClonePermissions(RootPart); | 3457 | part.ClonePermissions(RootPart); |
| 3458 | }); | 3458 | }); |
| 3459 | 3459 | ||
| 3460 | RootPart.OwnerMask = newOwnerMask | foldedPerms; | 3460 | uint lockMask = ~(uint)PermissionMask.Move; |
| 3461 | uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move; | ||
| 3462 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); | ||
| 3461 | RootPart.ScheduleFullUpdate(); | 3463 | RootPart.ScheduleFullUpdate(); |
| 3462 | } | 3464 | } |
| 3463 | 3465 | ||