Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-05 15:06:00 +01:00
41 changed files with 547 additions and 429 deletions

View File

@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell
item.CurrentPermissions |= 16; // Slam!
item.CreationDate = Util.UnixTimeSinceEpoch();
if (m_scene.InventoryService.AddItem(item))
if (m_scene.AddInventoryItem(item))
{
remoteClient.SendInventoryItemCreateUpdate(item, 0);
}