diff options
author | UbitUmarov | 2016-12-18 03:55:44 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-18 03:55:44 +0000 |
commit | 2cf422582aad3dc99304b831b7d8bece2b28ecb3 (patch) | |
tree | f71220097fb5d40de3a269322bb5580ae23c93e2 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | just give up on Export flag, seems just broken no matter water with current F... (diff) | |
download | opensim-SC-2cf422582aad3dc99304b831b7d8bece2b28ecb3.zip opensim-SC-2cf422582aad3dc99304b831b7d8bece2b28ecb3.tar.gz opensim-SC-2cf422582aad3dc99304b831b7d8bece2b28ecb3.tar.bz2 opensim-SC-2cf422582aad3dc99304b831b7d8bece2b28ecb3.tar.xz |
leave stupid broken permissions alone
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 9772b35..000944f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -433,7 +433,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
433 | // m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); | 433 | // m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions); |
434 | const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export); | 434 | const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export); |
435 | // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export | 435 | // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export |
436 | if (item.CreatorIdAsUuid != item.Owner || | 436 | if (item.CreatorIdAsUuid != item.Owner && |
437 | ((item.BasePermissions & permALLandExport) != permALLandExport || | 437 | ((item.BasePermissions & permALLandExport) != permALLandExport || |
438 | (item.CurrentPermissions & (uint)PermissionMask.Export) == 0)) | 438 | (item.CurrentPermissions & (uint)PermissionMask.Export) == 0)) |
439 | denyExportChange = true; | 439 | denyExportChange = true; |
@@ -451,12 +451,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
451 | { | 451 | { |
452 | itemUpd.NextPermissions = (uint)(PermissionMask.All); | 452 | itemUpd.NextPermissions = (uint)(PermissionMask.All); |
453 | itemUpd.EveryOnePermissions |= (uint)PermissionMask.Export; | 453 | itemUpd.EveryOnePermissions |= (uint)PermissionMask.Export; |
454 | sendUpdate = true; | ||
455 | } | 454 | } |
456 | else | 455 | else |
457 | { | 456 | { |
458 | itemUpd.EveryOnePermissions &= ~(uint)PermissionMask.Export; | 457 | itemUpd.EveryOnePermissions &= ~(uint)PermissionMask.Export; |
459 | sendUpdate = true; | ||
460 | } | 458 | } |
461 | } | 459 | } |
462 | else | 460 | else |
@@ -466,7 +464,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
466 | { | 464 | { |
467 | // m_log.DebugFormat("[XXX]: Force full perm"); | 465 | // m_log.DebugFormat("[XXX]: Force full perm"); |
468 | itemUpd.NextPermissions = (uint)(PermissionMask.All); | 466 | itemUpd.NextPermissions = (uint)(PermissionMask.All); |
469 | sendUpdate = true; | ||
470 | } | 467 | } |
471 | } | 468 | } |
472 | 469 | ||