Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-07-20 21:39:20 +01:00

View File

@@ -752,10 +752,6 @@ namespace OpenSim.Region.Framework.Scenes
{
item.AssetID = m_items[item.ItemID].AssetID;
}
else if ((InventoryType)item.Type == InventoryType.Notecard)
{
ScenePresence presence = m_part.ParentGroup.Scene.GetScenePresence(item.OwnerID);
}
m_items[item.ItemID] = item;
m_inventorySerial++;