diff options
| author | Melanie | 2010-01-26 15:12:41 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-26 15:12:41 +0000 |
| commit | e9c9a74e0ade505ee8d8d8e7790141f758a65f61 (patch) | |
| tree | 8aec3c51c714b0f2ec713880759cfd8f6a7cbcd3 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.zip opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.gz opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.bz2 opensim-SC-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.xz | |
Some merge fixups
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | } |