From 38f0615ffef1b60d98029ca433d158d97c0d0183 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Sun, 10 Feb 2008 21:27:32 +0000
Subject: * This updates adds locking capability.  Thanks, lbsa71 for pointing
 out my bitmasking error of the objectflags!   It's still a little bit wonky
 when you check the checkbox, however it 'takes' and doesn't break anything.

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs       |  1 +
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 12 ++----------
 OpenSim/Region/Environment/Scenes/SceneObjectPart.cs  |  9 +++++----
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index ca3b858..7421957 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -768,6 +768,7 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     group.GrabMovement(offset, pos, remoteClient);
                 }
+                group.SendGroupTerseUpdate();
             }
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 3cef65c..2917056 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -60,7 +60,7 @@ namespace OpenSim.Region.Environment.Scenes
         /// since the group's last persistent backup
         /// </summary>
         public bool HasGroupChanged = false;
-        private bool m_locked = false;
+        
 
         private LLVector3 lastPhysGroupPos;
         private LLQuaternion lastPhysGroupRot;
@@ -1225,15 +1225,7 @@ namespace OpenSim.Region.Environment.Scenes
             Children.Values.CopyTo(partArray, 0);
             return partArray;
         }
-        public bool GetLocked()
-        {
-            return m_locked;
-        }
-        public void SetLocked(bool val)
-        {
-            m_locked = val;
-
-        }
+        
         /// <summary>
         /// 
         /// </summary>
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 8c25dfa..06c0472 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -1620,13 +1620,14 @@ namespace OpenSim.Region.Environment.Scenes
                 {
                     if (addRemTF == (byte)0)
                     {
-                        m_parentGroup.SetLocked(true);
-                         //OwnerMask &= ~mask;
+                        //m_parentGroup.SetLocked(true);
+                        //PermissionMask.
+                         OwnerMask &= ~mask;
                     }
                     else
                     {
-                        m_parentGroup.SetLocked(false);
-                        //OwnerMask |= mask;
+                        //m_parentGroup.SetLocked(false);
+                        OwnerMask |= mask;
                     }
                     SendFullUpdateToAllClients();
                     
-- 
cgit v1.1