diff options
| author | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-23 01:16:12 +0100 |
|---|---|---|
| committer | Graham Linden graham@lindenlab.com <Graham Linden graham@lindenlab.com> | 2018-05-23 01:16:12 +0100 |
| commit | 439273c9c11ec5f3c186fd7d97a28d11419153cd (patch) | |
| tree | f6e4f1566425921d71e40b9628011eb0f5f539f3 /indra/newview/lltooldraganddrop.cpp | |
| parent | 13536bb273b7413aa4461c8eeaf5a6a865f4234d (diff) | |
| parent | 689beff6698fcb8582c44f58bb9896606850b149 (diff) | |
Merge
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index bd68d8c999..9fb53dc9ab 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1278,7 +1278,6 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { is_in_trash = true; - remove_from_inventory = TRUE; } LLUUID source_id = from_task_inventory ? mSourceID : LLUUID::null; @@ -1806,7 +1805,6 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnLand( if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { accept = ACCEPT_YES_SINGLE; - remove_inventory = TRUE; } if(drop) |