Merge branch 'avination' into ubitwork

3 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
index 6b33561..908f628 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
@@ -377,7 +377,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     protocol = "https";
                 }
                 caps.RegisterHandler("GetMesh", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
-                m_pollservices.Add(agentID, args);
+                m_pollservices[agentID] = args;
                 m_capsDict[agentID] = capUrl;
 
 
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
index dd87671..d4dbfb9 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
@@ -333,7 +333,7 @@ namespace OpenSim.Region.ClientStack.Linden
                 protocol = "https";
             }
             caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
-            m_pollservices.Add(agentID, args);
+            m_pollservices[agentID] = args;
             m_capsDict[agentID] = capUrl;
         }
 
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b9f9c86..0b974c6 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3439,17 +3439,19 @@ 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;
+            uint lockMask = ~(uint)PermissionMask.Move;
+            uint lockBit = RootPart.OwnerMask & (uint)PermissionMask.Move;
+            RootPart.OwnerMask = (RootPart.OwnerMask & lockBit) | ((newOwnerMask | foldedPerms) & lockMask);
             RootPart.ScheduleFullUpdate();
         }