diff options
| author | Melanie Thielker | 2008-10-06 03:27:16 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-10-06 03:27:16 +0000 |
| commit | fd96bb6f437d98d5cb8453be281a107dd0dfc129 (patch) | |
| tree | da8b25ad1acdbdcb0328ee59216d14dff474b7d6 /OpenSim | |
| parent | More perms fixes. Reinstate the move flag (diff) | |
| download | opensim-SC-fd96bb6f437d98d5cb8453be281a107dd0dfc129.zip opensim-SC-fd96bb6f437d98d5cb8453be281a107dd0dfc129.tar.gz opensim-SC-fd96bb6f437d98d5cb8453be281a107dd0dfc129.tar.bz2 opensim-SC-fd96bb6f437d98d5cb8453be281a107dd0dfc129.tar.xz | |
One should not commit even the smallest fox without compile. Fix build break
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 1b2ee7d..24ebc48 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
| @@ -255,18 +255,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 255 | perms &= part.MaskEffectivePermissions(); | 255 | perms &= part.MaskEffectivePermissions(); |
| 256 | } | 256 | } |
| 257 | 257 | ||
| 258 | if (ownerMask & (uint)PermissionMask.Modify) == 0) | 258 | if ((ownerMask & (uint)PermissionMask.Modify) == 0) |
| 259 | perms &= ~(uint)PermissionMask.Modify; | 259 | perms &= ~(uint)PermissionMask.Modify; |
| 260 | if (ownerMask & (uint)PermissionMask.Copy) == 0) | 260 | if ((ownerMask & (uint)PermissionMask.Copy) == 0) |
| 261 | perms &= ~(uint)PermissionMask.Copy; | 261 | perms &= ~(uint)PermissionMask.Copy; |
| 262 | if (ownerMask & (uint)PermissionMask.Transfer) == 0) | 262 | if ((ownerMask & (uint)PermissionMask.Transfer) == 0) |
| 263 | perms &= ~(uint)PermissionMask.Transfer; | 263 | perms &= ~(uint)PermissionMask.Transfer; |
| 264 | 264 | ||
| 265 | if (ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0) | 265 | if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Modify) == 0) |
| 266 | perms &= ~((uint)PermissionMask.Modify >> 13); | 266 | perms &= ~((uint)PermissionMask.Modify >> 13); |
| 267 | if (ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0) | 267 | if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Copy) == 0) |
| 268 | perms &= ~((uint)PermissionMask.Copy >> 13); | 268 | perms &= ~((uint)PermissionMask.Copy >> 13); |
| 269 | if (ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) | 269 | if ((ownerMask & RootPart.NextOwnerMask & (uint)PermissionMask.Transfer) == 0) |
| 270 | perms &= ~((uint)PermissionMask.Transfer >> 13); | 270 | perms &= ~((uint)PermissionMask.Transfer >> 13); |
| 271 | 271 | ||
| 272 | return perms; | 272 | return perms; |