Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge

Conflicts: OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
author: Melanie 2011-10-11 23:17:47 +0100
committer: Melanie 2011-10-11 23:17:47 +0100
commit: ef9a811ea6cbad4493c4ac8653c3c0abdd632f28 (patch)
tree: 2fbcb334f48d6375654534596a4153f2455cb8c6 /OpenSim/Framework
parent: Merge commit '31125a5fd275a37261d87a336385f5447a62004e' into bigmerge (diff)
parent: Remove usage of Linden packet types from inside Attachments Module and interface (diff)
download: opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.zip
opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.gz
opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.bz2
opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.xz
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index cdd50d0..f02543d 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -53,8 +53,7 @@ namespace OpenSim.Framework
    public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
-    public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
+    public delegate void RezMultipleAttachmentsFromInv(IClientAPI remoteClient, List<KeyValuePair<UUID, uint>> rezlist );
-                                                       RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
    public delegate void ObjectAttach(
        IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
author	Melanie	2011-10-11 23:17:47 +0100
committer	Melanie	2011-10-11 23:17:47 +0100
commit	ef9a811ea6cbad4493c4ac8653c3c0abdd632f28 (patch)
tree	2fbcb334f48d6375654534596a4153f2455cb8c6 /OpenSim/Framework
parent	Merge commit '31125a5fd275a37261d87a336385f5447a62004e' into bigmerge (diff)
parent	Remove usage of Linden packet types from inside Attachments Module and interface (diff)
download	opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.zip opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.gz opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.bz2 opensim-SC_OLD-ef9a811ea6cbad4493c4ac8653c3c0abdd632f28.tar.xz

diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index cdd50d0..f02543d 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);