livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-7417 FIXED Confirmation is not shown when removing your own object inworld

meow-7.2.2
Mnikolenko Productengine 2017-05-19 17:46:08 +03:00
parent e72c120e9e
commit c7d7728e4a
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llviewermessage.cpp
View File

@ -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;
}