diff options
| author | Justin Clark-Casey (justincc) | 2011-10-03 23:26:52 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-10-03 23:26:52 +0100 |
| commit | 34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c (patch) | |
| tree | 6e67c262564a16a79e7821cc5d1c5a70090f5677 /OpenSim/Region/Framework | |
| parent | Remove vestigal RegionStatus.SlaveScene. (diff) | |
| parent | Remove usage of Linden packet types from inside Attachments Module and interface (diff) | |
| download | opensim-SC-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.zip opensim-SC-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.gz opensim-SC-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.bz2 opensim-SC-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 5ffbec8..8d3366c 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | using System; | 28 | using System; |
| 29 | using System.Collections.Generic; | ||
| 29 | using OpenMetaverse; | 30 | using OpenMetaverse; |
| 30 | using OpenMetaverse.Packets; | 31 | using OpenMetaverse.Packets; |
| 31 | using OpenSim.Framework; | 32 | using OpenSim.Framework; |
| @@ -104,8 +105,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 104 | /// <param name="objects"></param> | 105 | /// <param name="objects"></param> |
| 105 | void RezMultipleAttachmentsFromInventory( | 106 | void RezMultipleAttachmentsFromInventory( |
| 106 | IClientAPI remoteClient, | 107 | IClientAPI remoteClient, |
| 107 | RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 108 | List<KeyValuePair<UUID, uint>> rezlist); |
| 108 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); | ||
| 109 | 109 | ||
| 110 | /// <summary> | 110 | /// <summary> |
| 111 | /// Detach an object from the avatar. | 111 | /// Detach an object from the avatar. |