Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-07-20 21:39:20 +01:00
commit dcf7973c9b
1 changed files with 0 additions and 4 deletions

View File

@ -752,10 +752,6 @@ namespace OpenSim.Region.Framework.Scenes
{ {
item.AssetID = m_items[item.ItemID].AssetID; 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_items[item.ItemID] = item;
m_inventorySerial++; m_inventorySerial++;