ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2011-10-03 23:26:52 +01:00
parent 37ae6451f9 e77c919290
commit 34026887fe
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -53,8 +53,7 @@ namespace OpenSim.Framework
public delegate ISceneEntity RezSingleAttachmentFromInv(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); 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( public delegate void ObjectAttach(
IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent); IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);

7
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@@ -6079,9 +6079,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
RezMultipleAttachmentsFromInv handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv; RezMultipleAttachmentsFromInv handlerRezMultipleAttachments = OnRezMultipleAttachmentsFromInv;
if (handlerRezMultipleAttachments != null) if (handlerRezMultipleAttachments != null)
{ {
RezMultipleAttachmentsFromInvPacket rez = (RezMultipleAttachmentsFromInvPacket)Pack; List<KeyValuePair<UUID, uint>> rezlist = new List<KeyValuePair<UUID, uint>>();
handlerRezMultipleAttachments(this, rez.HeaderData, foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in ((RezMultipleAttachmentsFromInvPacket)Pack).ObjectData)
rez.ObjectData); rezlist.Add(new KeyValuePair<UUID, uint>(obj.ItemID, obj.AttachmentPt));
handlerRezMultipleAttachments(this, rezlist);
} }
return true; return true;

9
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@@ -360,8 +360,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
public void RezMultipleAttachmentsFromInventory( public void RezMultipleAttachmentsFromInventory(
IClientAPI remoteClient, IClientAPI remoteClient,
RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, List<KeyValuePair<UUID, uint>> rezlist)
RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects)
{ {
if (!Enabled) if (!Enabled)
return; return;
@@ -380,9 +379,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
{ {
// m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name); // m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing multiple attachments from inventory for {0}", sp.Name);
foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) foreach (KeyValuePair<UUID, uint> rez in rezlist)
{ {
RezSingleAttachmentFromInventory(sp, obj.ItemID, obj.AttachmentPt); RezSingleAttachmentFromInventory(sp, rez.Key, rez.Value);
} }
} }
} }
@@ -941,4 +940,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
return item; return item;
} }
} }
} }

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

@@ -26,6 +26,7 @@
*/ */
using System; using System;
using System.Collections.Generic;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.Packets; using OpenMetaverse.Packets;
using OpenSim.Framework; using OpenSim.Framework;
@@ -104,8 +105,7 @@ namespace OpenSim.Region.Framework.Interfaces
/// <param name="objects"></param> /// <param name="objects"></param>
void RezMultipleAttachmentsFromInventory( void RezMultipleAttachmentsFromInventory(
IClientAPI remoteClient, IClientAPI remoteClient,
RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, List<KeyValuePair<UUID, uint>> rezlist);
RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
/// <summary> /// <summary>
/// Detach an object from the avatar. /// Detach an object from the avatar.

0
runprebuild2010.bat Normal file → Executable file
View File