diff options
author | Justin Clarke Casey | 2009-04-07 17:46:23 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-04-07 17:46:23 +0000 |
commit | ed6165ab9cb0726ab4d41265b097faf1d12d15b4 (patch) | |
tree | eeb08d6257ccd82bebdadc95020fe31698643858 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | temporarily revert llanglebetween patch until unit test can be updated - affe... (diff) | |
download | opensim-SC_OLD-ed6165ab9cb0726ab4d41265b097faf1d12d15b4.zip opensim-SC_OLD-ed6165ab9cb0726ab4d41265b097faf1d12d15b4.tar.gz opensim-SC_OLD-ed6165ab9cb0726ab4d41265b097faf1d12d15b4.tar.bz2 opensim-SC_OLD-ed6165ab9cb0726ab4d41265b097faf1d12d15b4.tar.xz |
* Apply http://opensimulator.org/mantis/view.php?id=3227
* Implement "Add To Outfit"
* Thanks FredoChaplin
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 |
1 files changed, 10 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); |