diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 000944f..61ea8ac 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -431,11 +431,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
431 | bool denyExportChange = false; | 431 | bool denyExportChange = false; |
432 | 432 | ||
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 | |
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.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner) |
437 | ((item.BasePermissions & permALLandExport) != permALLandExport || | ||
438 | (item.CurrentPermissions & (uint)PermissionMask.Export) == 0)) | ||
439 | denyExportChange = true; | 437 | denyExportChange = true; |
440 | 438 | ||
441 | // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); | 439 | // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); |