From 9b83e53b28fe42220a602f37ee8976eeee63302b Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 31 Mar 2013 21:59:44 +0100
Subject: Export permission, part two. Setting export perms for textures and
 clothing works. Setting perms for prims also works but they don't propagate
 correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated
 before you can use this!

---
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 46 ++++++++++++++++++++--
 1 file changed, 43 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 2ce778d..8ddaa60 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -418,18 +418,57 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (itemUpd.NextPermissions != 0) // Use this to determine validity. Can never be 0 if valid
                 {
+                    // Create a set of base permissions that will not include export if the user
+                    // is not allowed to change the export flag.
+                    bool denyExportChange = false;
+
+                    m_log.InfoFormat("[XXX]: B: {0} O: {1} E: {2}", itemUpd.BasePermissions, itemUpd.CurrentPermissions, itemUpd.EveryOnePermissions);
+
+                    // 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)
+                        denyExportChange = true;
+
+                    m_log.InfoFormat("[XXX]: Deny Export Update {0}", denyExportChange);
+
+                    // If it is already set, force it set and also force full perm
+                    // else prevent setting it. It can and should never be set unless
+                    // set in base, so the condition above is valid
+                    if (denyExportChange)
+                    {
+                        // If we are not allowed to change it, then force it to the
+                        // original item's setting and if it was on, also force full perm
+                        if ((item.EveryOnePermissions & (uint)PermissionMask.Export) != 0)
+                        {
+                            itemUpd.NextPermissions = (uint)(PermissionMask.All);
+                            itemUpd.EveryOnePermissions |= (uint)PermissionMask.Export;
+                        }
+                        else
+                        {
+                            itemUpd.EveryOnePermissions &= ~(uint)PermissionMask.Export;
+                        }
+                    }
+                    else
+                    {
+                        // If the new state is exportable, force full perm
+                        if ((itemUpd.EveryOnePermissions & (uint)PermissionMask.Export) != 0)
+                        {
+                            m_log.InfoFormat("[XXX]: Force full perm");
+                            itemUpd.NextPermissions = (uint)(PermissionMask.All);
+                        }
+                    }
+
                     if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))
                         item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner;
                     item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
+
                     if (item.EveryOnePermissions != (itemUpd.EveryOnePermissions & item.BasePermissions))
                         item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteEveryone;
                     item.EveryOnePermissions = itemUpd.EveryOnePermissions & item.BasePermissions;
+
                     if (item.GroupPermissions != (itemUpd.GroupPermissions & item.BasePermissions))
                         item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteGroup;
-
-//                    m_log.DebugFormat("[USER INVENTORY]: item.Flags {0}", item.Flags);
-
                     item.GroupPermissions = itemUpd.GroupPermissions & item.BasePermissions;
+
                     item.GroupID = itemUpd.GroupID;
                     item.GroupOwned = itemUpd.GroupOwned;
                     item.CreationDate = itemUpd.CreationDate;
@@ -451,6 +490,7 @@ namespace OpenSim.Region.Framework.Scenes
                     item.SaleType = itemUpd.SaleType;
 
                     InventoryService.UpdateItem(item);
+                    remoteClient.SendBulkUpdateInventory(item);
                 }
 
                 if (UUID.Zero != transactionID)
-- 
cgit v1.1