2 files changed, 13 insertions, 7 deletions

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 436b24e..33dae66 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1881,7 +1881,8 @@ namespace OpenSim.Region.Environment.Scenes
         /// <summary>
         /// Synchronously delete the given object from the scene.
         /// </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)
         {
             //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
         /// object itself is not destroyed.
         /// </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>
-        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 (!resultOfLinkingObjects)
+                if (!softDelete)
+                {
                     m_storageManager.DataStore.RemoveObject(uuid,
-                            m_regInfo.RegionID);
+                                                            m_regInfo.RegionID);
+                }
+
                 return true;
             }
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 8a024b7..908bb0d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1063,7 +1063,8 @@ namespace OpenSim.Region.Environment.Scenes
 
         /// <summary>
         /// 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)
         {
             // We need to keep track of this state in case this group is still queued for backup.