diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2019-05-08 17:33:52 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2019-05-08 17:33:52 +0300 |
| commit | b41ebb7bea9a30d5824c8adc7c86d7d270b2b72d (patch) | |
| tree | 7b5d046b00d5b4c1ec5efe705e68fc2a096a2ac8 /indra | |
| parent | 098f6399fb00498e2866c63cb455c1a5d6700e76 (diff) | |
SL-1579 Don't put an object to 'Received Items' after taking it back into inventory
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 2b9f0f642e..52b2c631fa 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -4751,6 +4751,12 @@ void handle_take() category_id.setNull(); } + // check inbox + const LLUUID inbox_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_INBOX); + if (category_id == inbox_id || gInventory.isObjectDescendentOf(category_id, inbox_id)) + { + category_id.setNull(); + } } } if(category_id.isNull()) |