diff options
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
Conflicts:
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index d1b7dc1..d7f0a96 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | using System; | 28 | using System; |
| 29 | using System.Xml; | 29 | using System.Xml; |
| 30 | using System.Collections.Generic; | ||
| 30 | using OpenMetaverse; | 31 | using OpenMetaverse; |
| 31 | using OpenMetaverse.Packets; | 32 | using OpenMetaverse.Packets; |
| 32 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
| @@ -109,8 +110,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 109 | /// <param name="objects"></param> | 110 | /// <param name="objects"></param> |
| 110 | void RezMultipleAttachmentsFromInventory( | 111 | void RezMultipleAttachmentsFromInventory( |
| 111 | IClientAPI remoteClient, | 112 | IClientAPI remoteClient, |
| 112 | RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 113 | List<KeyValuePair<UUID, uint>> rezlist); |
| 113 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); | ||
| 114 | 114 | ||
| 115 | /// <summary> | 115 | /// <summary> |
| 116 | /// Detach an object from the avatar. | 116 | /// Detach an object from the avatar. |