OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove code that tried to delete an attachment back to inventory if RezSingleAttachmentFromInventoryInternal() returned null. 

null would only ever be returned if the item couldn't be located within inventory and this would happen immediately.
In this case, derezzing wouldn't work anyway since there is no item to derez.
0.7.3-extended
Justin Clark-Casey (justincc) 2012-06-28 22:48:49 +01:00
parent 51724128bf
commit 25109c8e4d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -365,12 +365,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
return null; return null;
} }
SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt); return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt);
if (att == null)
DetachSingleAttachmentToInv(sp, itemID);
return att;
} }
public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist) public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist)