From e9c9a74e0ade505ee8d8d8e7790141f758a65f61 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 26 Jan 2010 15:12:41 +0000
Subject: Some merge fixups

---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 ++--
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index aea005e..8b58b3e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -74,7 +74,7 @@ namespace OpenSim.Region.Framework.Scenes
         /// <summary>
         /// Stop the scripts contained in all the prims in this group
         /// </summary>
-        public void RemoveScriptInstances()
+        public void RemoveScriptInstances(bool sceneObjectBeingDeleted)
         {
             lockPartsForRead(true);
             List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values);
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes
             
             foreach (SceneObjectPart part in values)
             {
-                part.Inventory.RemoveScriptInstances();
+                part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted);
             }
             
         }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 1de0092..9661775 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.Framework.Scenes
             {
                 if ((int)InventoryType.LSL == item.InvType)
                 {
-                    RemoveScriptInstance(item.ItemID);
+                    RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
                     m_part.RemoveScriptEvents(item.ItemID);
                 }
             }
-- 
cgit v1.1