From 8894f4ad7735fc0a37fd62c89467163f6ec503cb Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 8 Oct 2012 01:34:32 +0200
Subject: Change permissions on child prim inventory items when god mode "force
 permissive" is used.

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 4798481..9dd6639 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3422,8 +3422,16 @@ namespace OpenSim.Region.Framework.Scenes
         {
             RootPart.UpdatePermissions(AgentID, field, localID, mask, addRemTF);
 
+            bool god = Scene.Permissions.IsGod(AgentID);
+
             AdjustChildPrimPermissions();
 
+            if (field == 1 && god) // Base mask was set. Update all child part inventories
+            {
+                foreach (SceneObjectPart part in Parts)
+                    part.Inventory.ApplyGodPermissions(RootPart.BaseMask);
+            }
+
             HasGroupChanged = true;
 
             // Send the group's properties to all clients once all parts are updated
-- 
cgit v1.1


From aba078c93f4966cf6be10fc02228323843b9249e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 14 Oct 2012 17:32:46 +0200
Subject: Fix perms when linking an object. Set root part perms to the perms of
 the link set to make the build floater behave consistently. Fixes permissions
 exploit introduced on 23 August.

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 7 +++++++
 1 file changed, 7 insertions(+)

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9dd6639..053bfb4 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3410,11 +3410,18 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void AdjustChildPrimPermissions()
         {
+            uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits
+            uint foldedPerms = RootPart.OwnerMask & 3;
+
             ForEachPart(part =>
             {
+                newOwnerMask &= part.BaseMask;
                 if (part != RootPart)
                     part.ClonePermissions(RootPart);
             });
+
+            RootPart.OwnerMask = newOwnerMask | foldedPerms;
+            RootPart.ScheduleFullUpdate();
         }
 
         public void UpdatePermissions(UUID AgentID, byte field, uint localID,
-- 
cgit v1.1


From 1a34f42426b5819f97079c138c596182bf683416 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 28 Oct 2012 18:34:57 +0100
Subject: Add a property to determine if a link set is stored in the database.
 Also, fix a bug where "Force object permissive" god action would fail to
 reset child prim permissions.

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b12d0e0..ee61de6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -307,6 +307,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         private bool m_isBackedUp;
 
+        public bool IsBackedUp
+        {
+            get { return m_isBackedUp; }
+        }
+
         protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>();
 
         protected ulong m_regionHandle;
@@ -3431,6 +3436,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             bool god = Scene.Permissions.IsGod(AgentID);
 
+            if (field == 1 && god)
+            {
+                ForEachPart(part =>
+                {
+                    part.BaseMask = RootPart.BaseMask;
+                });
+            }
+
             AdjustChildPrimPermissions();
 
             if (field == 1 && god) // Base mask was set. Update all child part inventories
-- 
cgit v1.1