merge fix

10 files changed, 98 insertions, 111 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index afdd99e..bba7a96 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -338,7 +338,7 @@ namespace OpenSim.Region.Framework.Scenes
             // Update item with new asset
             item.AssetID = asset.FullID;
             group.UpdateInventoryItem(item);
-            group.AggregatePerms();
+            group.InvalidateEffectivePerms();
 
             part.SendPropertiesToClient(remoteClient);
 
@@ -1216,7 +1216,7 @@ namespace OpenSim.Region.Framework.Scenes
                     }
 
                     group.RemoveInventoryItem(localID, itemID);
-                    group.AggregatePerms();
+                    group.InvalidateEffectivePerms();
                 }
 
                 part.SendPropertiesToClient(remoteClient);
@@ -1388,11 +1388,7 @@ namespace OpenSim.Region.Framework.Scenes
             }
 
             if (!Permissions.CanCopyObjectInventory(itemId, part.UUID, remoteClient.AgentId))
-            {
-                // check also if we can delete the no copy item
-                if(!Permissions.CanEditObject(part.UUID, remoteClient.AgentId))
-                    return;
-            }
+                return;
 
             string message;
             InventoryItemBase item = MoveTaskInventoryItem(remoteClient, folderId, part, itemId, out message);
@@ -1742,8 +1738,25 @@ namespace OpenSim.Region.Framework.Scenes
                 // Check if we're allowed to mess with permissions
                 if (!Permissions.IsGod(remoteClient.AgentId)) // Not a god
                 {
+                    bool noChange;
                     if (remoteClient.AgentId != part.OwnerID) // Not owner
                     {
+                        noChange = true;
+                        if(itemInfo.OwnerID == UUID.Zero && itemInfo.GroupID != UUID.Zero)
+                        {
+                            if(remoteClient.IsGroupMember(itemInfo.GroupID))
+                            {
+                                ulong powers = remoteClient.GetGroupPowers(itemInfo.GroupID);
+                                if((powers & (ulong)GroupPowers.ObjectManipulate) != 0)
+                                    noChange = false;
+                            }
+                        }
+                    }
+                    else
+                        noChange = false;
+
+                    if(noChange)
+                    {
                         // Friends and group members can't change any perms
                         itemInfo.BasePermissions = currentItem.BasePermissions;
                         itemInfo.EveryonePermissions = currentItem.EveryonePermissions;
@@ -1769,7 +1782,6 @@ namespace OpenSim.Region.Framework.Scenes
                         itemInfo.CurrentPermissions &= currentItem.BasePermissions;
                         itemInfo.NextPermissions &= currentItem.BasePermissions;
                     }
-
                 }
                 else
                 {
@@ -1955,7 +1967,7 @@ namespace OpenSim.Region.Framework.Scenes
             part.Inventory.AddInventoryItem(taskItem, false);
             part.Inventory.CreateScriptInstance(taskItem, 0, false, DefaultScriptEngine, 0);
 
-            part.ParentGroup.AggregatePerms();
+            part.ParentGroup.InvalidateEffectivePerms();
 
             // tell anyone managing scripts that a new script exists
             EventManager.TriggerNewScript(agentID, part, taskItem.ItemID);
@@ -2643,7 +2655,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // We can only call this after adding the scene object, since the scene object references the scene
                 // to find out if scripts should be activated at all.
-                group.AggregatePerms();
+                group.InvalidateEffectivePerms();
                 group.CreateScriptInstances(param, true, DefaultScriptEngine, 3);
 
                 group.ScheduleGroupForFullUpdate();
@@ -2740,7 +2752,7 @@ namespace OpenSim.Region.Framework.Scenes
                     // and with this comented code, if user does not set next permissions on the object
                     // and on ALL contents of ALL prims, he may loose rights, making the object useless
                     sog.ApplyNextOwnerPermissions();
-                    sog.AggregatePerms();
+                    sog.InvalidateEffectivePerms();
 
                     sog.ScheduleGroupForFullUpdate();
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
index c55a7a6..a75671e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Permissions.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Region.Framework.Scenes
     public delegate bool DuplicateObjectHandler(SceneObjectGroup sog, ScenePresence sp);
     public delegate bool EditObjectByIDsHandler(UUID objectID, UUID editorID);
     public delegate bool EditObjectHandler(SceneObjectGroup sog, ScenePresence sp);
+    public delegate bool EditObjectPermsHandler(SceneObjectGroup sog, UUID editorID);
     public delegate bool EditObjectInventoryHandler(UUID objectID, UUID editorID);
     public delegate bool MoveObjectHandler(SceneObjectGroup sog, ScenePresence sp);
     public delegate bool ObjectEntryHandler(SceneObjectGroup sog, bool enteringRegion, Vector3 newPoint);
@@ -133,6 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
         public event DuplicateObjectHandler OnDuplicateObject;
         public event EditObjectByIDsHandler OnEditObjectByIDs;
         public event EditObjectHandler OnEditObject;
+        public event EditObjectPermsHandler OnEditObjectPerms;
         public event EditObjectInventoryHandler OnEditObjectInventory;
         public event MoveObjectHandler OnMoveObject;
         public event ObjectEntryHandler OnObjectEntry;
@@ -511,6 +513,24 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
+        public bool CanEditObjectPermissions(SceneObjectGroup sog, UUID editorID)
+        {
+            EditObjectPermsHandler handler = OnEditObjectPerms;
+            if (handler != null)
+            {
+                if(sog == null)
+                    return false;
+                Delegate[] list = handler.GetInvocationList();
+                foreach (EditObjectPermsHandler h in list)
+                {
+                    if (h(sog, editorID) == false)
+                        return false;
+                }
+            }
+            return true;
+        }
+
+
         public bool CanEditObjectInventory(UUID objectID, UUID editorID)
         {
             EditObjectInventoryHandler handler = OnEditObjectInventory;
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 715ae5c..e709d6c 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -978,6 +978,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_maxDrawDistance = startupConfig.GetFloat("MaxDrawDistance", m_maxDrawDistance);
                 m_maxRegionViewDistance = startupConfig.GetFloat("MaxRegionsViewDistance", m_maxRegionViewDistance);
 
+                // old versions compatibility
                 LegacySitOffsets = startupConfig.GetBoolean("LegacySitOffsets", LegacySitOffsets);
 
                 if (m_defaultDrawDistance > m_maxDrawDistance)
@@ -2390,8 +2391,9 @@ namespace OpenSim.Region.Framework.Scenes
                 EventManager.TriggerOnSceneObjectLoaded(group);
                 SceneObjectPart rootPart = group.GetPart(group.UUID);
                 rootPart.Flags &= ~PrimFlags.Scripted;
-                group.AggregateDeepPerms();
+
                 rootPart.TrimPermissions();
+                group.InvalidateDeepEffectivePerms();
 
                 // Don't do this here - it will get done later on when sculpt data is loaded.
                 //                group.CheckSculptAndLoad();
@@ -2662,7 +2664,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (UserManagementModule != null)
                 sceneObject.RootPart.CreatorIdentification = UserManagementModule.GetUserUUI(ownerID);
 
-            sceneObject.AggregateDeepPerms();
+            sceneObject.InvalidateDeepEffectivePerms();;
             sceneObject.ScheduleGroupForFullUpdate();
 
             return sceneObject;
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index a005068..117d92d 100755
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -343,7 +343,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sceneObject.ForceInventoryPersistence();
                 sceneObject.HasGroupChanged = true;
             }
-            sceneObject.AggregateDeepPerms();
+            sceneObject.InvalidateDeepEffectivePerms();
             return ret;
         }
 
@@ -2094,7 +2094,7 @@ namespace OpenSim.Region.Framework.Scenes
                                 child.TriggerScriptChangedEvent(Changed.OWNER);
                                 child.ApplyNextOwnerPermissions();
                             }
-                            copy.AggregatePerms();
+                            copy.InvalidateEffectivePerms();
                         }
                     }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 36844a9..f778367 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Framework.Scenes
                 addFromAllowedDrop = (part.ParentGroup.RootPart.GetEffectiveObjectFlags() & (uint)PrimFlags.AllowInventoryDrop) != 0;
 
             part.Inventory.AddInventoryItem(taskItem, addFromAllowedDrop);
-            part.ParentGroup.AggregatePerms();
+            part.ParentGroup.InvalidateEffectivePerms();
             return true;
 
         }
@@ -254,13 +254,26 @@ namespace OpenSim.Region.Framework.Scenes
         // new test code, to place in better place later
         private object m_PermissionsLock = new object();
         private bool m_EffectivePermsInvalid = true;
+        private bool m_DeepEffectivePermsInvalid = true;
 
+        // should called when parts chanced  by their contents did not, so we know their cacche is valid
+        // in case of doubt call InvalidateDeepEffectivePerms(), it only costs a bit more cpu time
         public void InvalidateEffectivePerms()
         {
             lock(m_PermissionsLock)
                 m_EffectivePermsInvalid = true;
         }
 
+        // should called when parts chanced and their contents where accounted for
+        public void InvalidateDeepEffectivePerms()
+        {
+            lock(m_PermissionsLock)
+            {
+                m_DeepEffectivePermsInvalid = true;
+                m_EffectivePermsInvalid = true;
+            }
+        }
+
         private uint m_EffectiveEveryOnePerms;
         public uint EffectiveEveryOnePerms
         {
@@ -317,79 +330,6 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
-        // aggregates perms scanning parts and their contents
-        // AggregatePerms does same using cached parts content perms
-        public void AggregateDeepPerms()
-        {
-            lock(m_PermissionsLock)
-            {
-                // aux
-                const uint allmask = (uint)PermissionMask.AllEffective;
-                const uint movemodmask = (uint)(PermissionMask.Move | PermissionMask.Modify);
-                const uint copytransfermask = (uint)(PermissionMask.Copy | PermissionMask.Transfer);
-
-                uint basePerms = (RootPart.BaseMask & allmask) | (uint)PermissionMask.Move;
-                bool noBaseTransfer = (basePerms & (uint)PermissionMask.Transfer) == 0;
-
-                uint rootOwnerPerms = RootPart.OwnerMask;
-                uint owner = rootOwnerPerms;
-                uint rootGroupPerms = RootPart.GroupMask;
-                uint group = rootGroupPerms;
-                uint rootEveryonePerms = RootPart.EveryoneMask;
-                uint everyone = rootEveryonePerms;
-
-                // date is time of writing april 30th 2017
-                bool newObject = (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994);
-                SceneObjectPart[] parts = m_parts.GetArray();
-                for (int i = 0; i < parts.Length; i++)
-                {
-                    SceneObjectPart part = parts[i];
-                    part.AggregateInnerPerms();
-                    owner &= part.AggregatedInnerOwnerPerms; 
-                    group &= part.AggregatedInnerGroupPerms;
-                    if(newObject)
-                        everyone &= part.AggregatedInnerEveryonePerms;
-                }
-                // recover modify and move
-                rootOwnerPerms &= movemodmask;
-                owner |= rootOwnerPerms;
-                if((owner & copytransfermask) == 0)
-                    owner |= (uint)PermissionMask.Transfer;
-
-                owner &= basePerms;
-                m_EffectiveOwnerPerms = owner;
-                uint ownertransfermask = owner & (uint)PermissionMask.Transfer;
-
-                // recover modify and move
-                rootGroupPerms &= movemodmask;
-                group |= rootGroupPerms;
-                if(noBaseTransfer)
-                    group &=~(uint)PermissionMask.Copy;
-                else
-                    group |= ownertransfermask;
-
-                uint groupOrEveryone = group;
-                m_EffectiveGroupPerms = group & owner;
-
-                // recover move
-                rootEveryonePerms &= (uint)PermissionMask.Move;
-                everyone |= rootEveryonePerms;
-                everyone &= ~(uint)PermissionMask.Modify;
-                if(noBaseTransfer)
-                    everyone &=~(uint)PermissionMask.Copy;
-                else
-                    everyone |= ownertransfermask;
-
-                groupOrEveryone |= everyone;
-
-                m_EffectiveEveryOnePerms = everyone  & owner;
-                m_EffectiveGroupOrEveryOnePerms = groupOrEveryone  & owner;
-                m_EffectivePermsInvalid = false;
-            }
-        }
-
-        // aggregates perms scanning parts, assuming their contents was already aggregated and cached
-        // ie is AggregateDeepPerms without the part.AggregateInnerPerms() call on parts loop
         public void AggregatePerms()
         {
             lock(m_PermissionsLock)
@@ -411,14 +351,20 @@ namespace OpenSim.Region.Framework.Scenes
 
                 bool needUpdate = false;
                 // date is time of writing april 30th 2017
-                bool newObject = (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994);
+                bool newobj = (RootPart.CreationDate == 0 || RootPart.CreationDate > 1493574994);
                 SceneObjectPart[] parts = m_parts.GetArray();
                 for (int i = 0; i < parts.Length; i++)
                 {
                     SceneObjectPart part = parts[i];
+
+                    if(m_DeepEffectivePermsInvalid)
+                        part.AggregateInnerPerms();
+
                     owner &= part.AggregatedInnerOwnerPerms; 
                     group &= part.AggregatedInnerGroupPerms;
-                    if(newObject)
+                    if(newobj)
+                        group &= part.AggregatedInnerGroupPerms;
+                    if(newobj)
                         everyone &= part.AggregatedInnerEveryonePerms;
                 }
                 // recover modify and move
@@ -477,6 +423,7 @@ namespace OpenSim.Region.Framework.Scenes
                     m_EffectiveGroupOrEveryOnePerms = tmpPerms;
                 }
 
+                m_DeepEffectivePermsInvalid = false;
                 m_EffectivePermsInvalid = false;
               
                 if(needUpdate)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index e73795e..93c9b42 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -2677,7 +2677,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (dupe.m_rootPart.PhysActor != null)
                     dupe.m_rootPart.PhysActor.Building = false; // tell physics to finish building
 
-                dupe.AggregateDeepPerms();
+                dupe.InvalidateDeepEffectivePerms();
 
                 dupe.HasGroupChanged = true;
                 dupe.AttachToBackup();
@@ -2943,7 +2943,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (!m_scene.Permissions.BypassPermissions())
                 {
                     ApplyNextOwnerPermissions();
-                    AggregatePerms();
+                    InvalidateEffectivePerms();
                 }
             }
 
@@ -3605,7 +3605,7 @@ namespace OpenSim.Region.Framework.Scenes
 
             InvalidBoundsRadius();
             InvalidatePartsLinkMaps();
-            objectGroup.AggregatePerms();
+            objectGroup.InvalidateEffectivePerms();
 
             if (sendEvents)
                 linkPart.TriggerScriptChangedEvent(Changed.LINK);
@@ -4163,7 +4163,7 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.DebugFormat(
 //                "[SCENE OBJECT GROUP]: RootPart.OwnerMask now {0} for {1} in {2}",
 //                (OpenMetaverse.PermissionMask)RootPart.OwnerMask, Name, Scene.Name);
-            AggregatePerms();
+            InvalidateEffectivePerms();
             RootPart.ScheduleFullUpdate();
         }
 
@@ -4188,7 +4188,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 foreach (SceneObjectPart part in Parts)
                     part.Inventory.ApplyGodPermissions(RootPart.BaseMask);
-                AggregatePerms();
+                InvalidateEffectivePerms();
             }
 
             HasGroupChanged = true;
@@ -5447,7 +5447,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 part.ResetOwnerChangeFlag();
             });
-            AggregatePerms();
+            InvalidateEffectivePerms();
         }
 
         // clear some references to easy cg
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index f948336..d980fe5 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -4460,8 +4460,11 @@ SendFullUpdateToClient(remoteClient, Position) ignores position parameter
             if (god)
                 baseMask = 0x7ffffff0;
 
-            // Are we the owner?
-            if ((AgentID == OwnerID) || god)
+            bool canChange = (AgentID == OwnerID) || god;
+            if(!canChange)
+                canChange = ParentGroup.Scene.Permissions.CanEditObjectPermissions(ParentGroup, AgentID);
+
+            if (canChange)
             {
                 switch (field)
                 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 3ed37a2..60efc04 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -236,11 +236,8 @@ namespace OpenSim.Region.Framework.Scenes
             IList<TaskInventoryItem> items = new List<TaskInventoryItem>(Items.Values);
             foreach (TaskInventoryItem item in items)
             {
-                if (groupID != item.GroupID)
-                {
                     item.GroupID = groupID;
                 }
-            }
             m_items.LockItemsForWrite(false);
         }
 
@@ -982,7 +979,7 @@ namespace OpenSim.Region.Framework.Scenes
                 }
 // old code end
                 rootPart.TrimPermissions();
-                group.AggregateDeepPerms();
+                group.InvalidateDeepEffectivePerms();
             }
 
             return true;
@@ -1020,6 +1017,9 @@ namespace OpenSim.Region.Framework.Scenes
                 if (item.GroupPermissions != (uint)PermissionMask.None)
                     item.GroupID = m_part.GroupID;
 
+                if(item.OwnerID == UUID.Zero) // viewer to internal enconding of group owned
+                    item.OwnerID = item.GroupID; 
+
                 if (item.AssetID == UUID.Zero)
                     item.AssetID = m_items[item.ItemID].AssetID;
 
@@ -1031,8 +1031,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 if (considerChanged)
                 {
-                    m_part.AggregateInnerPerms();
-                    m_part.ParentGroup.AggregatePerms();
+                    m_part.ParentGroup.InvalidateDeepEffectivePerms();
                     HasInventoryChanged = true;
                     m_part.ParentGroup.HasGroupChanged = true;
                 }
@@ -1075,8 +1074,7 @@ namespace OpenSim.Region.Framework.Scenes
                 m_items.Remove(itemID);
                 m_items.LockItemsForWrite(false);
 
-                m_part.AggregateInnerPerms();
-                m_part.ParentGroup.AggregatePerms();
+                m_part.ParentGroup.InvalidateDeepEffectivePerms();
 
                 m_inventorySerial++;
                 m_part.TriggerScriptChangedEvent(Changed.INVENTORY);
@@ -1199,15 +1197,20 @@ namespace OpenSim.Region.Framework.Scenes
                     invString.AddNameValueLine("next_owner_mask", Utils.UIntToHexString(item.NextPermissions));
 
                     invString.AddNameValueLine("creator_id", item.CreatorID.ToString());
-                    invString.AddNameValueLine("owner_id", ownerID.ToString());
 
                     invString.AddNameValueLine("last_owner_id", item.LastOwnerID.ToString());
 
                     invString.AddNameValueLine("group_id",groupID.ToString());
                     if(groupID != UUID.Zero && ownerID == groupID)
+                    {
+                        invString.AddNameValueLine("owner_id", UUID.Zero.ToString());
                         invString.AddNameValueLine("group_owned","1");
+                    }
                     else
+                    {
+                        invString.AddNameValueLine("owner_id", ownerID.ToString());
                         invString.AddNameValueLine("group_owned","0");
+                    }
 
                     invString.AddSectionEnd();
 
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 87d1ace..892403b 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             // Script state may, or may not, exist. Not having any, is NOT
             // ever a problem.
             sceneObject.LoadScriptState(reader);
-            sceneObject.AggregateDeepPerms();
+            sceneObject.InvalidateDeepEffectivePerms();
             return sceneObject;
         }
 
@@ -278,7 +278,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                 // Script state may, or may not, exist. Not having any, is NOT
                 // ever a problem.
                 sceneObject.LoadScriptState(doc);
-                sceneObject.AggregatePerms();
+//                sceneObject.AggregatePerms();
                 return sceneObject;
             }
             catch (Exception e)
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
index 0f022dd..34fdb6d 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneXmlLoader.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
                     //obj.RegenerateFullIDs();
 
                     scene.AddNewSceneObject(obj, true);
-                    obj.AggregateDeepPerms();
+                    obj.InvalidateDeepEffectivePerms();
                 }
             }
             else