diff options
| author | Dev Random | 2014-07-11 08:56:04 -0400 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-07-14 18:06:24 +0100 |
| commit | 4e92b552311e52dd3b2d6dadb34b67cdc14dceaa (patch) | |
| tree | a2b4c395a2efbdbebefeaeeddd81fa2578733187 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | minor: Move debug xengine script console command to Debug help section where ... (diff) | |
| download | opensim-SC-4e92b552311e52dd3b2d6dadb34b67cdc14dceaa.zip opensim-SC-4e92b552311e52dd3b2d6dadb34b67cdc14dceaa.tar.gz opensim-SC-4e92b552311e52dd3b2d6dadb34b67cdc14dceaa.tar.bz2 opensim-SC-4e92b552311e52dd3b2d6dadb34b67cdc14dceaa.tar.xz | |
Call RemoveScriptInstance when removing from inventory
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 75e1cbb..578909c 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
| @@ -870,8 +870,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 870 | int type = m_items[itemID].InvType; | 870 | int type = m_items[itemID].InvType; |
| 871 | if (type == 10) // Script | 871 | if (type == 10) // Script |
| 872 | { | 872 | { |
| 873 | m_part.RemoveScriptEvents(itemID); | 873 | // route it through here, to handle script cleanup tasks |
| 874 | m_part.ParentGroup.Scene.EventManager.TriggerRemoveScript(m_part.LocalId, itemID); | 874 | RemoveScriptInstance(itemID, false); |
| 875 | } | 875 | } |
| 876 | m_items.Remove(itemID); | 876 | m_items.Remove(itemID); |
| 877 | m_inventorySerial++; | 877 | m_inventorySerial++; |