diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-29 17:09:17 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-29 17:09:17 +0000 |
| commit | eaf83ea9c7eef663456507c32b0c1511ab69d157 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/newview/lltooldraganddrop.cpp | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (diff) | |
Merged in D440-merge-master (pull request #1)
Merge master (release 6.3.7) into DRTVWR-440
Approved-by: Dave Houlton <euclid@lindenlab.com>
Diffstat (limited to 'indra/newview/lltooldraganddrop.cpp')
| -rw-r--r-- | indra/newview/lltooldraganddrop.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index e43015a793..50868d0fa5 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -1730,6 +1730,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv( const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false); if(gInventory.isObjectDescendentOf(item->getUUID(), outbox_id)) { + // Legacy return ACCEPT_NO; } @@ -2156,6 +2157,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( const LLUUID &outbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_OUTBOX, false); if(gInventory.isObjectDescendentOf(category->getUUID(), outbox_id)) { + // Legacy return ACCEPT_NO; } |