ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
This commit is contained in:
Melanie
2011-10-11 23:17:47 +01:00
parent 1556389913 e77c919290
commit ef9a811ea6
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
View File

@@ -27,6 +27,7 @@
using System;
using System.Xml;
using System.Collections.Generic;
using OpenMetaverse;
using OpenMetaverse.Packets;
using OpenSim.Framework;
@@ -109,8 +110,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.