diff options
| author | Melanie Thielker | 2017-01-06 18:13:33 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2017-01-06 18:13:33 +0000 |
| commit | f2c50db968dd03cd361e407f4054a94ea59930d2 (patch) | |
| tree | dcdfdae6a436878a0866dfc9fec63d0acdaeec0d /OpenSim | |
| parent | Merge branch 'master' of opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f2c50db968dd03cd361e407f4054a94ea59930d2.zip opensim-SC_OLD-f2c50db968dd03cd361e407f4054a94ea59930d2.tar.gz opensim-SC_OLD-f2c50db968dd03cd361e407f4054a94ea59930d2.tar.bz2 opensim-SC_OLD-f2c50db968dd03cd361e407f4054a94ea59930d2.tar.xz | |
Fix an artefact introduced by git's revert merging logic
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 45c3ebd..6557003 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -1362,15 +1362,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1362 | // "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}", | 1362 | // "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}", |
| 1363 | // item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions); | 1363 | // item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions); |
| 1364 | 1364 | ||
| 1365 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) | 1365 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) |
| 1366 | { | 1366 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; |
| 1367 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) | 1367 | if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) |
| 1368 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; | 1368 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; |
| 1369 | if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) | 1369 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) |
| 1370 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; | 1370 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; |
| 1371 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) | ||
| 1372 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; | ||
| 1373 | } | ||
| 1374 | } | 1371 | } |
| 1375 | item.CurrentPermissions &= item.NextPermissions; | 1372 | item.CurrentPermissions &= item.NextPermissions; |
| 1376 | item.BasePermissions &= item.NextPermissions; | 1373 | item.BasePermissions &= item.NextPermissions; |