diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 0be6b7f..11cee7c 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -31,6 +31,7 @@ using System.Reflection; | |||
31 | using System.Text; | 31 | using System.Text; |
32 | using System.Timers; | 32 | using System.Timers; |
33 | using OpenMetaverse; | 33 | using OpenMetaverse; |
34 | using OpenMetaverse.Packets; | ||
34 | using log4net; | 35 | using log4net; |
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
36 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
@@ -2563,6 +2564,15 @@ namespace OpenSim.Region.Framework.Scenes | |||
2563 | return att.UUID; | 2564 | return att.UUID; |
2564 | } | 2565 | } |
2565 | 2566 | ||
2567 | public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | ||
2568 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects) | ||
2569 | { | ||
2570 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) | ||
2571 | { | ||
2572 | RezSingleAttachment(remoteClient, obj.ItemID, obj.AttachmentPt); | ||
2573 | } | ||
2574 | } | ||
2575 | |||
2566 | public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent) | 2576 | public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent) |
2567 | { | 2577 | { |
2568 | m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent); | 2578 | m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent); |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 0da819d..0991171 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1935,6 +1935,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1935 | client.OnDeRezObject += DeRezObject; | 1935 | client.OnDeRezObject += DeRezObject; |
1936 | client.OnRezObject += RezObject; | 1936 | client.OnRezObject += RezObject; |
1937 | client.OnRezSingleAttachmentFromInv += RezSingleAttachment; | 1937 | client.OnRezSingleAttachmentFromInv += RezSingleAttachment; |
1938 | client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments; | ||
1938 | client.OnDetachAttachmentIntoInv += DetachSingleAttachmentToInv; | 1939 | client.OnDetachAttachmentIntoInv += DetachSingleAttachmentToInv; |
1939 | client.OnObjectAttach += m_sceneGraph.AttachObject; | 1940 | client.OnObjectAttach += m_sceneGraph.AttachObject; |
1940 | client.OnObjectDetach += m_sceneGraph.DetachObject; | 1941 | client.OnObjectDetach += m_sceneGraph.DetachObject; |