diff options
| author | Diva Canto | 2010-06-09 12:22:25 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-09 12:22:25 -0700 |
| commit | 2a71df1285076260f9fa0d04fc66f7ce4018b5f3 (patch) | |
| tree | 7f899ed541929112390127261c92271dde16ff59 /OpenSim | |
| parent | Bug fix on attachments: don't delete the item from inventory when it's droppe... (diff) | |
| download | opensim-SC_OLD-2a71df1285076260f9fa0d04fc66f7ce4018b5f3.zip opensim-SC_OLD-2a71df1285076260f9fa0d04fc66f7ce4018b5f3.tar.gz opensim-SC_OLD-2a71df1285076260f9fa0d04fc66f7ce4018b5f3.tar.bz2 opensim-SC_OLD-2a71df1285076260f9fa0d04fc66f7ce4018b5f3.tar.xz | |
Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 46d040f..d1792d7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
| @@ -375,16 +375,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
| 375 | } | 375 | } |
| 376 | part.ParentGroup.DetachToGround(); | 376 | part.ParentGroup.DetachToGround(); |
| 377 | 377 | ||
| 378 | // If the item is no-copy we need to delete it from inventory | 378 | List<UUID> uuids = new List<UUID>(); |
| 379 | InventoryItemBase item = m_scene.InventoryService.GetItem(new InventoryItemBase(itemID)); | 379 | uuids.Add(inventoryID); |
| 380 | if (item != null && (item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | 380 | m_scene.InventoryService.DeleteItems(remoteClient.AgentId, uuids); |
| 381 | { | 381 | remoteClient.SendRemoveInventoryItem(inventoryID); |
| 382 | List<UUID> uuids = new List<UUID>(); | 382 | } |
| 383 | uuids.Add(inventoryID); | ||
| 384 | m_scene.InventoryService.DeleteItems(remoteClient.AgentId, uuids); | ||
| 385 | remoteClient.SendRemoveInventoryItem(inventoryID); | ||
| 386 | } | ||
| 387 | } | ||
| 388 | 383 | ||
| 389 | m_scene.EventManager.TriggerOnAttach(part.ParentGroup.LocalId, itemID, UUID.Zero); | 384 | m_scene.EventManager.TriggerOnAttach(part.ParentGroup.LocalId, itemID, UUID.Zero); |
| 390 | } | 385 | } |