aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-10 21:27:32 +0000
committerTeravus Ovares2008-02-10 21:27:32 +0000
commit38f0615ffef1b60d98029ca433d158d97c0d0183 (patch)
tree56b476fcb1696dcb8de3e310e8e93b79f36a125a /OpenSim/Region/Environment/Scenes
parentRemoved some ScriptEngine config debugging. (diff)
downloadopensim-SC_OLD-38f0615ffef1b60d98029ca433d158d97c0d0183.zip
opensim-SC_OLD-38f0615ffef1b60d98029ca433d158d97c0d0183.tar.gz
opensim-SC_OLD-38f0615ffef1b60d98029ca433d158d97c0d0183.tar.bz2
opensim-SC_OLD-38f0615ffef1b60d98029ca433d158d97c0d0183.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs12
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs9
3 files changed, 8 insertions, 14 deletions
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
768 { 768 {
769 group.GrabMovement(offset, pos, remoteClient); 769 group.GrabMovement(offset, pos, remoteClient);
770 } 770 }
771 group.SendGroupTerseUpdate();
771 } 772 }
772 } 773 }
773 774
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
60 /// since the group's last persistent backup 60 /// since the group's last persistent backup
61 /// </summary> 61 /// </summary>
62 public bool HasGroupChanged = false; 62 public bool HasGroupChanged = false;
63 private bool m_locked = false; 63
64 64
65 private LLVector3 lastPhysGroupPos; 65 private LLVector3 lastPhysGroupPos;
66 private LLQuaternion lastPhysGroupRot; 66 private LLQuaternion lastPhysGroupRot;
@@ -1225,15 +1225,7 @@ namespace OpenSim.Region.Environment.Scenes
1225 Children.Values.CopyTo(partArray, 0); 1225 Children.Values.CopyTo(partArray, 0);
1226 return partArray; 1226 return partArray;
1227 } 1227 }
1228 public bool GetLocked() 1228
1229 {
1230 return m_locked;
1231 }
1232 public void SetLocked(bool val)
1233 {
1234 m_locked = val;
1235
1236 }
1237 /// <summary> 1229 /// <summary>
1238 /// 1230 ///
1239 /// </summary> 1231 /// </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
1620 { 1620 {
1621 if (addRemTF == (byte)0) 1621 if (addRemTF == (byte)0)
1622 { 1622 {
1623 m_parentGroup.SetLocked(true); 1623 //m_parentGroup.SetLocked(true);
1624 //OwnerMask &= ~mask; 1624 //PermissionMask.
1625 OwnerMask &= ~mask;
1625 } 1626 }
1626 else 1627 else
1627 { 1628 {
1628 m_parentGroup.SetLocked(false); 1629 //m_parentGroup.SetLocked(false);
1629 //OwnerMask |= mask; 1630 OwnerMask |= mask;
1630 } 1631 }
1631 SendFullUpdateToAllClients(); 1632 SendFullUpdateToAllClients();
1632 1633