From 861477d85e794d067f372587ccf56d8887e5ec63 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 18 Dec 2012 09:32:05 +0100
Subject: Fix locking for good

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

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 0b974c6..4ad8b11 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3439,12 +3439,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void AdjustChildPrimPermissions()
         {
-            //uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits
-            //uint foldedPerms = RootPart.OwnerMask & 3;
+            uint newOwnerMask = (uint)PermissionMask.All & 0xfffffff8; // Mask folded bits
+            uint foldedPerms = RootPart.OwnerMask & 3;
 
             ForEachPart(part =>
             {
-                //newOwnerMask &= part.BaseMask;
+                newOwnerMask &= part.BaseMask;
                 if (part != RootPart)
                     part.ClonePermissions(RootPart);
             });
-- 
cgit v1.1