diff options
author | Justin Clark-Casey (justincc) | 2012-06-28 22:48:49 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-28 22:48:49 +0100 |
commit | f263d6a910f5c382756da04dd423db4a46b1eeb7 (patch) | |
tree | 05af55098d62e4b1ce4bae1ba999a54e16d98615 | |
parent | If rest of first line after colon is blank then still warn about running in X... (diff) | |
download | opensim-SC-f263d6a910f5c382756da04dd423db4a46b1eeb7.zip opensim-SC-f263d6a910f5c382756da04dd423db4a46b1eeb7.tar.gz opensim-SC-f263d6a910f5c382756da04dd423db4a46b1eeb7.tar.bz2 opensim-SC-f263d6a910f5c382756da04dd423db4a46b1eeb7.tar.xz |
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.
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 4a7fbce..e3ee2fc 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -365,12 +365,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
365 | return null; | 365 | return null; |
366 | } | 366 | } |
367 | 367 | ||
368 | SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt); | 368 | return RezSingleAttachmentFromInventoryInternal(sp, itemID, UUID.Zero, AttachmentPt); |
369 | |||
370 | if (att == null) | ||
371 | DetachSingleAttachmentToInv(sp, itemID); | ||
372 | |||
373 | return att; | ||
374 | } | 369 | } |
375 | 370 | ||
376 | public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist) | 371 | public void RezMultipleAttachmentsFromInventory(IScenePresence sp, List<KeyValuePair<UUID, uint>> rezlist) |