OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add a property to determine if a link set is stored in the database. Also, fix 

a bug where "Force object permissive" god action would fail to reset child prim
permissions.
avinationmerge
Melanie 2012-10-28 18:34:57 +01:00
parent 0d00b97aec
commit 1a34f42426
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -307,6 +307,11 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_isBackedUp; private bool m_isBackedUp;
public bool IsBackedUp
{
get { return m_isBackedUp; }
}
protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>(); protected MapAndArray<UUID, SceneObjectPart> m_parts = new MapAndArray<UUID, SceneObjectPart>();
protected ulong m_regionHandle; protected ulong m_regionHandle;
@ -3431,6 +3436,14 @@ namespace OpenSim.Region.Framework.Scenes
bool god = Scene.Permissions.IsGod(AgentID); bool god = Scene.Permissions.IsGod(AgentID);
if (field == 1 && god)
{
ForEachPart(part =>
{
part.BaseMask = RootPart.BaseMask;
});
}
AdjustChildPrimPermissions(); AdjustChildPrimPermissions();
if (field == 1 && god) // Base mask was set. Update all child part inventories if (field == 1 && god) // Base mask was set. Update all child part inventories