ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

* 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.

Browse Source
This commit is contained in:
Teravus Ovares
2008-02-10 21:27:32 +00:00
parent 0756e01475
commit 38f0615ffe
4 changed files with 49 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -768,6 +768,7 @@ namespace OpenSim.Region.Environment.Scenes
{
group.GrabMovement(offset, pos, remoteClient);
}
group.SendGroupTerseUpdate();
}
}

12
OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
View File

@@ -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>

9
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

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