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

Add a DeleteAllSceneObjects(bool exceptNoCopy) method to allow NoCopy objects to be retained when the scene is cleared.

avinationmerge
Tom Grimshaw 2010-06-26 11:14:58 -07:00
parent 5b6485481b
commit 70d3b9aeca
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2182,6 +2182,14 @@ namespace OpenSim.Region.Framework.Scenes
/// Delete every object from the scene. This does not include attachments worn by avatars. /// Delete every object from the scene. This does not include attachments worn by avatars.
/// </summary> /// </summary>
public void DeleteAllSceneObjects() public void DeleteAllSceneObjects()
{
DeleteAllSceneObjects(false);
}
/// <summary>
/// Delete every object from the scene. This does not include attachments worn by avatars.
/// </summary>
public void DeleteAllSceneObjects(bool exceptNoCopy)
{ {
lock (Entities) lock (Entities)
{ {
@ -2192,8 +2200,13 @@ namespace OpenSim.Region.Framework.Scenes
if (e is SceneObjectGroup) if (e is SceneObjectGroup)
{ {
SceneObjectGroup sog = (SceneObjectGroup)e; SceneObjectGroup sog = (SceneObjectGroup)e;
if (!sog.IsAttachment) if (sog != null && !sog.IsAttachment)
DeleteSceneObject((SceneObjectGroup)e, false); {
if (!exceptNoCopy || ((sog.GetEffectivePermissions() & (uint)PermissionMask.Copy) != 0))
{
DeleteSceneObject((SceneObjectGroup)e, false);
}
}
} }
} }
} }