aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 5d72af8..cb724aa 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -301,7 +301,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
301 301
302 // If we're an NPC then skip all the item checks and manipulations since we don't have an 302 // If we're an NPC then skip all the item checks and manipulations since we don't have an
303 // inventory right now. 303 // inventory right now.
304 RezSingleAttachmentFromInventoryInternal(sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, p | (uint)0x80, null); 304 RezSingleAttachmentFromInventoryInternal(
305 sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, p, true, null);
305 } 306 }
306 catch (Exception e) 307 catch (Exception e)
307 { 308 {
@@ -541,7 +542,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
541 return null; 542 return null;
542 } 543 }
543 544
544 return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, doc); 545 bool append = (AttachmentPt & 0x80) != 0;
546 AttachmentPt &= 0x7f;
547
548 return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, append, doc);
545 } 549 }
546 550
547 public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist) 551 public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist)
@@ -951,14 +955,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
951 } 955 }
952 956
953 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( 957 protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal(
954 IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, XmlDocument doc) 958 IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, bool append, XmlDocument doc)
955 { 959 {
956 if (m_invAccessModule == null) 960 if (m_invAccessModule == null)
957 return null; 961 return null;
958 962
959 bool append = (attachmentPt & 0x80) != 0;
960 attachmentPt &= 0x7f;
961
962 SceneObjectGroup objatt; 963 SceneObjectGroup objatt;
963 964
964 if (itemID != UUID.Zero) 965 if (itemID != UUID.Zero)