From d23be3001936ca8d5954368319046e9287a79aab Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 8 Aug 2015 19:21:47 +0200 Subject: [PATCH] FIRE-4970: Allow inventory DaD to the friend list --- indra/newview/fsfloatercontacts.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index 242ffdd083..90fbaa0f81 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -46,6 +46,7 @@ #include "llslurl.h" #include "llstartup.h" #include "lltabcontainer.h" +#include "lltooldraganddrop.h" #include "llviewermenu.h" #include "llvoiceclient.h" @@ -1303,7 +1304,16 @@ BOOL FSFloaterContacts::handleFriendsListDragAndDrop(S32 x, S32 y, MASK mask, BO } else { - *accept = ACCEPT_NO; + LLScrollListItem* hit_item = mFriendsList->hitItem(x, y); + if (hit_item) + { + LLToolDragAndDrop::handleGiveDragAndDrop(hit_item->getUUID(), LLUUID::null, drop, + cargo_type, cargo_data, accept); + } + else + { + *accept = ACCEPT_NO; + } } return TRUE;