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

* Minor refactoring and comments updates 

* Ignored some gens
0.6.3-post-fixes
lbsa71 2009-02-02 14:57:01 +00:00
parent 7ec667d279
commit 8a098bf12c
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -1881,7 +1881,8 @@ namespace OpenSim.Region.Environment.Scenes
/// <summary> /// <summary>
/// Synchronously delete the given object from the scene. /// Synchronously delete the given object from the scene.
/// </summary> /// </summary>
/// <param name="group"></param> /// <param name="group">Object Id</param>
/// <param name="silent">Suppress broadcasting changes to other clients.</param>
public void DeleteSceneObject(SceneObjectGroup group, bool silent) public void DeleteSceneObject(SceneObjectGroup group, bool silent)
{ {
//SceneObjectPart rootPart = group.GetChildPart(group.UUID); //SceneObjectPart rootPart = group.GetChildPart(group.UUID);
@ -1924,15 +1925,19 @@ namespace OpenSim.Region.Environment.Scenes
/// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the /// Unlink the given object from the scene. Unlike delete, this just removes the record of the object - the
/// object itself is not destroyed. /// object itself is not destroyed.
/// </summary> /// </summary>
/// <param name="uuid"></param> /// <param name="uuid">Id of object.</param>
/// <returns>true if the object was in the scene, false if it was not</returns> /// <returns>true if the object was in the scene, false if it was not</returns>
public bool UnlinkSceneObject(UUID uuid, bool resultOfLinkingObjects) /// <param name="softDelete">If true, only deletes from scene, but keeps object in database.</param>
public bool UnlinkSceneObject(UUID uuid, bool softDelete)
{ {
if (m_sceneGraph.DeleteSceneObject(uuid, resultOfLinkingObjects)) if (m_sceneGraph.DeleteSceneObject(uuid, softDelete))
{
if (!softDelete)
{ {
if (!resultOfLinkingObjects)
m_storageManager.DataStore.RemoveObject(uuid, m_storageManager.DataStore.RemoveObject(uuid,
m_regInfo.RegionID); m_regInfo.RegionID);
}
return true; return true;
} }

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

@ -1064,6 +1064,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <summary> /// <summary>
/// Delete this group from its scene and tell all the scene presences about that deletion. /// Delete this group from its scene and tell all the scene presences about that deletion.
/// </summary> /// </summary>
/// <param name="silent">Broadcast deletions to all clients.</param>
public void DeleteGroup(bool silent) public void DeleteGroup(bool silent)
{ {
// We need to keep track of this state in case this group is still queued for backup. // We need to keep track of this state in case this group is still queued for backup.