From 4e92b552311e52dd3b2d6dadb34b67cdc14dceaa Mon Sep 17 00:00:00 2001 From: Dev Random Date: Fri, 11 Jul 2014 08:56:04 -0400 Subject: [PATCH] Call RemoveScriptInstance when removing from inventory --- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 75e1cbbdbc..578909cdc5 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -870,8 +870,8 @@ namespace OpenSim.Region.Framework.Scenes int type = m_items[itemID].InvType; if (type == 10) // Script { - m_part.RemoveScriptEvents(itemID); - m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); + // route it through here, to handle script cleanup tasks + RemoveScriptInstance(itemID, false); } m_items.Remove(itemID); m_inventorySerial++;