diff options
| author | Melanie | 2013-06-23 01:35:09 +0100 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:35:09 +0100 |
| commit | 25ed1658cab91f0fcbfa8de3feab322eb3b9991a (patch) | |
| tree | da0ebfa873cf97de9bad369489ee61015a306692 /OpenSim/Region | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Fix prim locking to behave like SL (diff) | |
| download | opensim-SC-25ed1658cab91f0fcbfa8de3feab322eb3b9991a.zip opensim-SC-25ed1658cab91f0fcbfa8de3feab322eb3b9991a.tar.gz opensim-SC-25ed1658cab91f0fcbfa8de3feab322eb3b9991a.tar.bz2 opensim-SC-25ed1658cab91f0fcbfa8de3feab322eb3b9991a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index c465138..0a18d8a 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -3488,8 +3488,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3488 | part.ClonePermissions(RootPart); | 3488 | part.ClonePermissions(RootPart); |
| 3489 | }); | 3489 | }); |
| 3490 | 3490 | ||
| 3491 | uint lockMask = ~(uint)PermissionMask.Move; | 3491 | uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify); |
| 3492 | uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move; | 3492 | uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify); |
| 3493 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); | 3493 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); |
| 3494 | RootPart.ScheduleFullUpdate(); | 3494 | RootPart.ScheduleFullUpdate(); |
| 3495 | } | 3495 | } |