diff options
author | UbitUmarov | 2017-04-30 00:14:45 +0100 |
---|---|---|
committer | UbitUmarov | 2017-04-30 00:14:45 +0100 |
commit | 116d32d947e3c1446ce98dca0be62ea74055216d (patch) | |
tree | 5fec95a067a90006072d96c90f60ccbf34857783 /OpenSim/Region/Framework/Scenes | |
parent | nore permissions masks hierachy (diff) | |
download | opensim-SC-116d32d947e3c1446ce98dca0be62ea74055216d.zip opensim-SC-116d32d947e3c1446ce98dca0be62ea74055216d.tar.gz opensim-SC-116d32d947e3c1446ce98dca0be62ea74055216d.tar.bz2 opensim-SC-116d32d947e3c1446ce98dca0be62ea74055216d.tar.xz |
don't break groups permission mask
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index a2cee81..afdd99e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1283,8 +1283,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1283 | agentItem.CurrentPermissions = perms; | 1283 | agentItem.CurrentPermissions = perms; |
1284 | agentItem.NextPermissions = perms & taskItem.NextPermissions; | 1284 | agentItem.NextPermissions = perms & taskItem.NextPermissions; |
1285 | agentItem.EveryOnePermissions = perms & taskItem.EveryonePermissions; | 1285 | agentItem.EveryOnePermissions = perms & taskItem.EveryonePermissions; |
1286 | // Group permissions make no sense here | 1286 | agentItem.GroupPermissions = perms & taskItem.GroupPermissions; |
1287 | agentItem.GroupPermissions = 0; | ||
1288 | 1287 | ||
1289 | agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; | 1288 | agentItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; |
1290 | agentItem.Flags &= ~(uint)(InventoryItemFlags.ObjectOverwriteBase | InventoryItemFlags.ObjectOverwriteOwner | InventoryItemFlags.ObjectOverwriteGroup | InventoryItemFlags.ObjectOverwriteEveryone | InventoryItemFlags.ObjectOverwriteNextOwner); | 1289 | agentItem.Flags &= ~(uint)(InventoryItemFlags.ObjectOverwriteBase | InventoryItemFlags.ObjectOverwriteOwner | InventoryItemFlags.ObjectOverwriteGroup | InventoryItemFlags.ObjectOverwriteEveryone | InventoryItemFlags.ObjectOverwriteNextOwner); |
@@ -1295,7 +1294,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1295 | agentItem.CurrentPermissions = taskItem.CurrentPermissions; | 1294 | agentItem.CurrentPermissions = taskItem.CurrentPermissions; |
1296 | agentItem.NextPermissions = taskItem.NextPermissions; | 1295 | agentItem.NextPermissions = taskItem.NextPermissions; |
1297 | agentItem.EveryOnePermissions = taskItem.EveryonePermissions; | 1296 | agentItem.EveryOnePermissions = taskItem.EveryonePermissions; |
1298 | agentItem.GroupPermissions = 0; | 1297 | agentItem.GroupPermissions = taskItem.GroupPermissions; |
1299 | } | 1298 | } |
1300 | 1299 | ||
1301 | message = null; | 1300 | message = null; |