diff options
author | UbitUmarov | 2016-12-17 22:38:31 +0000 |
---|---|---|
committer | UbitUmarov | 2016-12-17 22:38:31 +0000 |
commit | c93551d8f43cf91f909a3909bc2bdbf70666201b (patch) | |
tree | f71220097fb5d40de3a269322bb5580ae23c93e2 /OpenSim/Region/Framework/Scenes | |
parent | break userprofiles a bit more (diff) | |
download | opensim-SC-c93551d8f43cf91f909a3909bc2bdbf70666201b.zip opensim-SC-c93551d8f43cf91f909a3909bc2bdbf70666201b.tar.gz opensim-SC-c93551d8f43cf91f909a3909bc2bdbf70666201b.tar.bz2 opensim-SC-c93551d8f43cf91f909a3909bc2bdbf70666201b.tar.xz |
allow a creator that is also onwer to change export flag. Add missing setting to ini files
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 61ea8ac..000944f 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -431,9 +431,11 @@ 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 | 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.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner) | 436 | if (item.CreatorIdAsUuid != item.Owner && |
437 | ((item.BasePermissions & permALLandExport) != permALLandExport || | ||
438 | (item.CurrentPermissions & (uint)PermissionMask.Export) == 0)) | ||
437 | denyExportChange = true; | 439 | denyExportChange = true; |
438 | 440 | ||
439 | // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); | 441 | // m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange); |