Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

This commit is contained in:
Justin Clark-Casey (justincc)
2011-10-03 23:26:52 +01:00
5 changed files with 11 additions and 12 deletions

View File

@@ -26,6 +26,7 @@
*/
using System;
using System.Collections.Generic;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
@@ -104,8 +105,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="objects"></param>
void RezMultipleAttachmentsFromInventory(
IClientAPI remoteClient,
RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
List<KeyValuePair<UUID, uint>> rezlist);
/// <summary>
/// Detach an object from the avatar.