diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-31 16:48:49 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-08-31 16:48:49 +0100 |
| commit | 57bb63bafd2adc744ea8cab63593abd90c7199df (patch) | |
| tree | 94ec221ca06ce32dee7e6138d655d8a575a46a23 /indra/newview/llviewermessage.cpp | |
| parent | 936ccff59f2045f5747a0730570784608f39a7b4 (diff) | |
| parent | 218584593a7815f7494be58a7b36774c47fd047f (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermessage.cpp')
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index ba4c632586..14846d898f 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -1224,6 +1224,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; } @@ -2838,6 +2843,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data) case IM_INVENTORY_ACCEPTED: { args["NAME"] = LLSLURL("agent", from_id, "completename").getSLURLString();; + args["ORIGINAL_NAME"] = original_name; LLSD payload; payload["from_id"] = from_id; // Passing the "SESSION_NAME" to use it for IM notification logging |