From 5ab5991676d09d3e510ea78043d0034cdc36f4bf Mon Sep 17 00:00:00 2001
From: mingchen
Date: Sat, 7 Jun 2008 00:24:43 +0000
Subject: *Fixing another object counting bug

---
 OpenSim/Region/Environment/Scenes/Scene.cs            | 6 +++---
 OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 7d076ef..8094e4c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1386,7 +1386,7 @@ namespace OpenSim.Region.Environment.Scenes
                 rootPart.PhysActor = null;
             }
 
-            if (UnlinkSceneObject(group.UUID))
+            if (UnlinkSceneObject(group.UUID, false))
             {
                 EventManager.TriggerObjectBeingRemovedFromScene(group);
                 EventManager.TriggerParcelPrimCountTainted();
@@ -1410,9 +1410,9 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="uuid"></param>
         /// <returns>true if the object was in the scene, false if it was not</returns>
-        public bool UnlinkSceneObject(LLUUID uuid)
+        public bool UnlinkSceneObject(LLUUID uuid, bool resultOfLinkingObjects)
         {
-            if (m_innerScene.DeleteSceneObject(uuid,true))
+            if (m_innerScene.DeleteSceneObject(uuid,resultOfLinkingObjects))
             {
                 m_storageManager.DataStore.RemoveObject(uuid, m_regInfo.RegionID);
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index c000047..d2687f3 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1784,7 +1784,7 @@ namespace OpenSim.Region.Environment.Scenes
                 part.ClearUndoState();
             }
 
-            m_scene.UnlinkSceneObject(objectGroup.UUID);
+            m_scene.UnlinkSceneObject(objectGroup.UUID, true);
 
             // TODO Deleting the parts may cause problems later on if they have already
             // made it into the update queue.  However, sending out updates for those parts is now
-- 
cgit v1.1