diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
2 files changed, 3 insertions, 3 deletions
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 | |||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Stop the scripts contained in all the prims in this group | 75 | /// Stop the scripts contained in all the prims in this group |
76 | /// </summary> | 76 | /// </summary> |
77 | public void RemoveScriptInstances() | 77 | public void RemoveScriptInstances(bool sceneObjectBeingDeleted) |
78 | { | 78 | { |
79 | lockPartsForRead(true); | 79 | lockPartsForRead(true); |
80 | List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values); | 80 | List<SceneObjectPart> values = new List<SceneObjectPart>(m_parts.Values); |
@@ -82,7 +82,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
82 | 82 | ||
83 | foreach (SceneObjectPart part in values) | 83 | foreach (SceneObjectPart part in values) |
84 | { | 84 | { |
85 | part.Inventory.RemoveScriptInstances(); | 85 | part.Inventory.RemoveScriptInstances(sceneObjectBeingDeleted); |
86 | } | 86 | } |
87 | 87 | ||
88 | } | 88 | } |
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 | |||
249 | { | 249 | { |
250 | if ((int)InventoryType.LSL == item.InvType) | 250 | if ((int)InventoryType.LSL == item.InvType) |
251 | { | 251 | { |
252 | RemoveScriptInstance(item.ItemID); | 252 | RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted); |
253 | m_part.RemoveScriptEvents(item.ItemID); | 253 | m_part.RemoveScriptEvents(item.ItemID); |
254 | } | 254 | } |
255 | } | 255 | } |