diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index dcd92d6..41533a1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1842,35 +1842,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
1842 | EventManager.TriggerOnAttach(localID, itemID, avatarID); | 1842 | EventManager.TriggerOnAttach(localID, itemID, avatarID); |
1843 | } | 1843 | } |
1844 | 1844 | ||
1845 | /// <summary> | ||
1846 | /// Called when the client receives a request to rez a single attachment on to the avatar from inventory | ||
1847 | /// (RezSingleAttachmentFromInv packet). | ||
1848 | /// </summary> | ||
1849 | /// <param name="remoteClient"></param> | ||
1850 | /// <param name="itemID"></param> | ||
1851 | /// <param name="AttachmentPt"></param> | ||
1852 | /// <returns></returns> | ||
1853 | public UUID RezSingleAttachment(IClientAPI remoteClient, UUID itemID, uint AttachmentPt) | ||
1854 | { | ||
1855 | m_log.DebugFormat("[USER INVENTORY]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name); | ||
1856 | |||
1857 | SceneObjectGroup att = AttachmentsModule.RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt); | ||
1858 | |||
1859 | if (att == null) | ||
1860 | { | ||
1861 | AttachmentsModule.ShowDetachInUserInventory(itemID, remoteClient); | ||
1862 | return UUID.Zero; | ||
1863 | } | ||
1864 | |||
1865 | return AttachmentsModule.SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt); | ||
1866 | } | ||
1867 | |||
1868 | public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, | 1845 | public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, |
1869 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects) | 1846 | RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects) |
1870 | { | 1847 | { |
1871 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) | 1848 | foreach (RezMultipleAttachmentsFromInvPacket.ObjectDataBlock obj in objects) |
1872 | { | 1849 | { |
1873 | RezSingleAttachment(remoteClient, obj.ItemID, obj.AttachmentPt); | 1850 | AttachmentsModule.RezSingleAttachmentFromInventory(remoteClient, obj.ItemID, obj.AttachmentPt); |
1874 | } | 1851 | } |
1875 | } | 1852 | } |
1876 | 1853 | ||