aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-05 23:29:24 +0000
committerJustin Clark-Casey (justincc)2010-03-05 23:29:24 +0000
commitb72c2dc6e88fa2ea6bb97e0b32d0cdbb2ea78c4a (patch)
treec10be55d7244e593f44deaf608b0d8d921995848 /OpenSim/Region/Framework/Scenes
parentrevert accidental Standalone.ini change (diff)
downloadopensim-SC_OLD-b72c2dc6e88fa2ea6bb97e0b32d0cdbb2ea78c4a.zip
opensim-SC_OLD-b72c2dc6e88fa2ea6bb97e0b32d0cdbb2ea78c4a.tar.gz
opensim-SC_OLD-b72c2dc6e88fa2ea6bb97e0b32d0cdbb2ea78c4a.tar.bz2
opensim-SC_OLD-b72c2dc6e88fa2ea6bb97e0b32d0cdbb2ea78c4a.tar.xz
refactor: move user inventory side of RezSingleAttachment to module
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs30
1 files changed, 1 insertions, 29 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 474fba9..6a5dc56 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1862,35 +1862,7 @@ namespace OpenSim.Region.Framework.Scenes
1862 return UUID.Zero; 1862 return UUID.Zero;
1863 } 1863 }
1864 1864
1865 return RezSingleAttachment(att, remoteClient, itemID, AttachmentPt); 1865 return AttachmentsModule.SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt);
1866 }
1867
1868 /// <summary>
1869 /// Update the user inventory to reflect an attachment
1870 /// </summary>
1871 /// <param name="att"></param>
1872 /// <param name="remoteClient"></param>
1873 /// <param name="itemID"></param>
1874 /// <param name="AttachmentPt"></param>
1875 /// <returns></returns>
1876 public UUID RezSingleAttachment(SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
1877 {
1878 m_log.DebugFormat(
1879 "[USER INVENTORY]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
1880 remoteClient.Name, att.Name, itemID);
1881
1882 if (!att.IsDeleted)
1883 AttachmentPt = att.RootPart.AttachmentPoint;
1884
1885 ScenePresence presence;
1886 if (TryGetAvatar(remoteClient.AgentId, out presence))
1887 {
1888 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
1889 item = InventoryService.GetItem(item);
1890
1891 presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
1892 }
1893 return att.UUID;
1894 } 1866 }
1895 1867
1896 public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header, 1868 public void RezMultipleAttachments(IClientAPI remoteClient, RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,