diff options
| author | Melanie | 2013-06-23 01:14:07 +0200 |
|---|---|---|
| committer | Melanie | 2013-06-23 01:34:35 +0100 |
| commit | 4bf1afe300c61ac79fee7d794ead2b0100c5687a (patch) | |
| tree | 51acc85a6a5f46d9c9937ae75898881fc155c94d /OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |
| parent | correct method doc for llRot2Axis() (diff) | |
| download | opensim-SC_OLD-4bf1afe300c61ac79fee7d794ead2b0100c5687a.zip opensim-SC_OLD-4bf1afe300c61ac79fee7d794ead2b0100c5687a.tar.gz opensim-SC_OLD-4bf1afe300c61ac79fee7d794ead2b0100c5687a.tar.bz2 opensim-SC_OLD-4bf1afe300c61ac79fee7d794ead2b0100c5687a.tar.xz | |
Fix prim locking to behave like SL
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs')
| -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 7b5fdcb..f1036ae 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
| @@ -2699,8 +2699,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2699 | part.ClonePermissions(RootPart); | 2699 | part.ClonePermissions(RootPart); |
| 2700 | }); | 2700 | }); |
| 2701 | 2701 | ||
| 2702 | uint lockMask = ~(uint)PermissionMask.Move; | 2702 | uint lockMask = ~(uint)(PermissionMask.Move | PermissionMask.Modify); |
| 2703 | uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move; | 2703 | uint lockBit = RootPart.OwnerMask & (uint)(PermissionMask.Move | PermissionMask.Modify); |
| 2704 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); | 2704 | RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask); |
| 2705 | RootPart.ScheduleFullUpdate(); | 2705 | RootPart.ScheduleFullUpdate(); |
| 2706 | } | 2706 | } |