diff options
author | Justin Clark-Casey (justincc) | 2013-03-29 23:59:21 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-03-29 23:59:21 +0000 |
commit | 76629289f001ef4bd0bac204e0f46907ebe5df5e (patch) | |
tree | a0381549a9094b14e20e0c988e98dc701b93cc5b /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |
parent | Added missing functionality (mainly custom headers) to llHTTPRequest. (diff) | |
download | opensim-SC_OLD-76629289f001ef4bd0bac204e0f46907ebe5df5e.zip opensim-SC_OLD-76629289f001ef4bd0bac204e0f46907ebe5df5e.tar.gz opensim-SC_OLD-76629289f001ef4bd0bac204e0f46907ebe5df5e.tar.bz2 opensim-SC_OLD-76629289f001ef4bd0bac204e0f46907ebe5df5e.tar.xz |
refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 4b53ee0..eec7ee5 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -257,7 +257,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
257 | // If we're an NPC then skip all the item checks and manipulations since we don't have an | 257 | // If we're an NPC then skip all the item checks and manipulations since we don't have an |
258 | // inventory right now. | 258 | // inventory right now. |
259 | RezSingleAttachmentFromInventoryInternal( | 259 | RezSingleAttachmentFromInventoryInternal( |
260 | sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, p | (uint)0x80); | 260 | sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, p, true); |
261 | } | 261 | } |
262 | catch (Exception e) | 262 | catch (Exception e) |
263 | { | 263 | { |
@@ -479,7 +479,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
479 | return null; | 479 | return null; |
480 | } | 480 | } |
481 | 481 | ||
482 | return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt); | 482 | bool append = (AttachmentPt & 0x80) != 0; |
483 | AttachmentPt &= 0x7f; | ||
484 | |||
485 | return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt, append); | ||
483 | } | 486 | } |
484 | 487 | ||
485 | public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist) | 488 | public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist) |
@@ -889,14 +892,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
889 | } | 892 | } |
890 | 893 | ||
891 | protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( | 894 | protected SceneObjectGroup RezSingleAttachmentFromInventoryInternal( |
892 | IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt) | 895 | IScenePresence sp, UUID itemID, UUID assetID, uint attachmentPt, bool append) |
893 | { | 896 | { |
894 | if (m_invAccessModule == null) | 897 | if (m_invAccessModule == null) |
895 | return null; | 898 | return null; |
896 | 899 | ||
897 | bool append = (attachmentPt & 0x80) != 0; | ||
898 | attachmentPt &= 0x7f; | ||
899 | |||
900 | SceneObjectGroup objatt; | 900 | SceneObjectGroup objatt; |
901 | 901 | ||
902 | if (itemID != UUID.Zero) | 902 | if (itemID != UUID.Zero) |