* Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts.

1 files changed, 4 insertions, 4 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b9f9c86..0b82093 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3439,17 +3439,17 @@ 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);
             });
 
-            RootPart.OwnerMask = newOwnerMask | foldedPerms;
+            //RootPart.OwnerMask = newOwnerMask | foldedPerms;
             RootPart.ScheduleFullUpdate();
         }