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/Framework | |
| parent | Remove vestigal RegionStatus.SlaveScene. (diff) | |
| parent | Remove usage of Linden packet types from inside Attachments Module and interface (diff) | |
| download | opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.zip opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.gz opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.bz2 opensim-SC_OLD-34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 47e79d1..d8ccc89 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
| @@ -53,8 +53,7 @@ namespace OpenSim.Framework | |||
| 53 | 53 | ||
| 54 | public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); | 54 | public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); |
| 55 | 55 | ||
| 56 | public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 56 | public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist ); |
| 57 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects); | ||
| 58 | 57 | ||
| 59 | public delegate void ObjectAttach( | 58 | public delegate void ObjectAttach( |
| 60 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); | 59 | IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); |