Some merge fixups

This commit is contained in:
Melanie
2010-01-26 15:12:41 +00:00
parent b80ea00265
commit e9c9a74e0a
4 changed files with 11 additions and 22 deletions

View File

@@ -249,7 +249,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if ((int)InventoryType.LSL == item.InvType)
{
RemoveScriptInstance(item.ItemID);
RemoveScriptInstance(item.ItemID, sceneObjectBeingDeleted);
m_part.RemoveScriptEvents(item.ItemID);
}
}