From 7a093df24b470a6c80d67b1f8572f37a2a350521 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 14 Dec 2012 03:35:55 +0100
Subject: Prevent a failed user relogi from throwing exceptions in poll
 services

---
 OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs    | 2 +-
 OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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;
         }
 
-- 
cgit v1.1


From d2695cb3f7356a5c4047bbef2ac8f83fc8350976 Mon Sep 17 00:00:00 2001
From: teravus
Date: Sat, 15 Dec 2012 16:26:03 -0500
Subject: * Fix for Prim Locking.   Prior to the merge, it was just a clone of
 the root part to each of the child parts.

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

(limited to 'OpenSim')

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();
         }
 
-- 
cgit v1.1


From 7d8c2b342c77cd4c5b26ee9500b5d9383b8bae77 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 16 Dec 2012 02:05:01 +0100
Subject: Fix locking objects

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

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index b9f9c86..4ad8b11 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3449,7 +3449,9 @@ namespace OpenSim.Region.Framework.Scenes
                     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();
         }
 
-- 
cgit v1.1


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(-)

(limited to 'OpenSim')

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