From c93551d8f43cf91f909a3909bc2bdbf70666201b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 17 Dec 2016 22:38:31 +0000
Subject: allow a creator that is also onwer to change export flag. Add missing
 setting to ini files

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region')

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
                     bool denyExportChange = false;
 
 //                    m_log.DebugFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
-
+                    const uint permALLandExport = (uint)(PermissionMask.All | PermissionMask.Export);
                     // If the user is not the creator or doesn't have "E" in both "B" and "O", deny setting export
-                    if ((item.BasePermissions & (uint)(PermissionMask.All | PermissionMask.Export)) != (uint)(PermissionMask.All | PermissionMask.Export) || (item.CurrentPermissions & (uint)PermissionMask.Export) == 0 || item.CreatorIdAsUuid != item.Owner)
+                    if (item.CreatorIdAsUuid != item.Owner &&
+                            ((item.BasePermissions & permALLandExport) != permALLandExport ||
+                                (item.CurrentPermissions & (uint)PermissionMask.Export) == 0))                       
                         denyExportChange = true;
 
 //                    m_log.DebugFormat("[XXX]: Deny Export Update {0}", denyExportChange);
-- 
cgit v1.1