diff options
| author | Oren Hurvitz | 2013-11-05 15:42:23 +0200 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-01-10 19:50:03 +0000 |
| commit | 91fd9c467083a57e2898594ce3ae764aa0525bb5 (patch) | |
| tree | 32078bfcfec717530d29f18d8b2afb6b41cfbab3 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Refactored setting permissions when rezzing items: use the same function when... (diff) | |
| download | opensim-SC_OLD-91fd9c467083a57e2898594ce3ae764aa0525bb5.zip opensim-SC_OLD-91fd9c467083a57e2898594ce3ae764aa0525bb5.tar.gz opensim-SC_OLD-91fd9c467083a57e2898594ce3ae764aa0525bb5.tar.bz2 opensim-SC_OLD-91fd9c467083a57e2898594ce3ae764aa0525bb5.tar.xz | |
Refactored: use a single function to apply an object's folded permissions to its main permissions
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 5fa01e3..fb8ecd5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -1132,14 +1132,11 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 1132 | // "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}", | 1132 | // "[SCENE OBJECT PART INVENTORY]: Applying next permissions {0} to {1} in {2} with current {3}, base {4}, everyone {5}", |
| 1133 | // item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions); | 1133 | // item.NextPermissions, item.Name, m_part.Name, item.CurrentPermissions, item.BasePermissions, item.EveryonePermissions); |
| 1134 | 1134 | ||
| 1135 | if (item.InvType == (int)InventoryType.Object && (item.CurrentPermissions & 7) != 0) | 1135 | if (item.InvType == (int)InventoryType.Object) |
| 1136 | { | 1136 | { |
| 1137 | if ((item.CurrentPermissions & ((uint)PermissionMask.Copy >> 13)) == 0) | 1137 | uint perms = item.CurrentPermissions; |
| 1138 | item.CurrentPermissions &= ~(uint)PermissionMask.Copy; | 1138 | PermissionsUtil.ApplyFoldedPermissions(perms, ref perms); |
| 1139 | if ((item.CurrentPermissions & ((uint)PermissionMask.Transfer >> 13)) == 0) | 1139 | item.CurrentPermissions = perms; |
| 1140 | item.CurrentPermissions &= ~(uint)PermissionMask.Transfer; | ||
| 1141 | if ((item.CurrentPermissions & ((uint)PermissionMask.Modify >> 13)) == 0) | ||
| 1142 | item.CurrentPermissions &= ~(uint)PermissionMask.Modify; | ||
| 1143 | } | 1140 | } |
| 1144 | 1141 | ||
| 1145 | item.CurrentPermissions &= item.NextPermissions; | 1142 | item.CurrentPermissions &= item.NextPermissions; |