Merge branch 'master' into vehicles

This commit is contained in:
Melanie
2009-10-01 14:08:15 +01:00
307 changed files with 3296 additions and 5638 deletions

View File

@@ -1015,7 +1015,7 @@ namespace OpenSim.Region.Framework.Scenes
return MoveTaskInventoryItem(avatar.ControllingClient, folderId, part, itemId);
}
else
{
{
InventoryItemBase agentItem = CreateAgentInventoryItemFromTask(avatarId, part, itemId);
if (agentItem == null)