diff options
| author | Dev Random | 2014-07-11 08:56:04 -0400 |
|---|---|---|
| committer | Justin Clark-Casey | 2014-08-02 00:53:35 +0100 |
| commit | d35b5737a8478481a566fb011c86256554098939 (patch) | |
| tree | 740df4b1c1fc7541124429d088fbb6967de43ab0 /OpenSim/Region/Framework | |
| parent | minor: Move debug xengine script console command to Debug help section where ... (diff) | |
| download | opensim-SC_OLD-d35b5737a8478481a566fb011c86256554098939.zip opensim-SC_OLD-d35b5737a8478481a566fb011c86256554098939.tar.gz opensim-SC_OLD-d35b5737a8478481a566fb011c86256554098939.tar.bz2 opensim-SC_OLD-d35b5737a8478481a566fb011c86256554098939.tar.xz | |
Call RemoveScriptInstance when removing from inventory
Diffstat (limited to 'OpenSim/Region/Framework')
| -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++; |