diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-05-19 17:46:08 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-05-19 17:46:08 +0300 |
| commit | c7d7728e4a4caadac1875856d77b752bc36a2f56 (patch) | |
| tree | 155c4847f8e30716717a42633bc9cfe27fd7628d /indra | |
| parent | e72c120e9eb1691abdcf0a3c6e650be68a15b6bb (diff) | |
MAINT-7417 FIXED Confirmation is not shown when removing your own object inworld
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 507087d1ae..2dc219a769 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1222,6 +1222,11 @@ void open_inventory_offer(const uuid_vec_t& objects, const std::string& from_nam const LLUUID& obj_id = (*obj_iter); if(!highlight_offered_object(obj_id)) { + const LLViewerInventoryCategory *parent = gInventory.getFirstNondefaultParent(obj_id); + if (parent && (parent->getPreferredType() == LLFolderType::FT_TRASH)) + { + gInventory.checkTrashOverflow(); + } continue; } |