diff options
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 3044017..11754ea 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -256,7 +256,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
256 | 256 | ||
257 | if (isScriptRunning) | 257 | if (isScriptRunning) |
258 | { | 258 | { |
259 | part.Inventory.RemoveScriptInstance(item.ItemID); | 259 | part.Inventory.RemoveScriptInstance(item.ItemID, false); |
260 | } | 260 | } |
261 | 261 | ||
262 | // Update item with new asset | 262 | // Update item with new asset |
@@ -855,8 +855,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
855 | 855 | ||
856 | if (item.Type == 10) | 856 | if (item.Type == 10) |
857 | { | 857 | { |
858 | part.RemoveScriptEvents(itemID); | ||
858 | EventManager.TriggerRemoveScript(localID, itemID); | 859 | EventManager.TriggerRemoveScript(localID, itemID); |
859 | } | 860 | } |
861 | |||
860 | group.RemoveInventoryItem(localID, itemID); | 862 | group.RemoveInventoryItem(localID, itemID); |
861 | part.GetProperties(remoteClient); | 863 | part.GetProperties(remoteClient); |
862 | } | 864 | } |