Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

1 files changed, 0 insertions, 14 deletions

diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 18c4917..2adcf14 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -1521,18 +1521,6 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
         gFloaterTools->dirty();
 }
 
-struct LLGiveInventoryInfo
-{
-        LLUUID mToAgentID;
-        LLUUID mInventoryObjectID;
-        LLUUID mIMSessionID;
-        LLGiveInventoryInfo(const LLUUID& to_agent, const LLUUID& obj_id, const LLUUID &im_session_id = LLUUID::null) :
-                mToAgentID(to_agent), 
-                mInventoryObjectID(obj_id),
-                mIMSessionID(im_session_id)
-        {}
-};
-
 void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent,
                                                                           LLInventoryItem* item,
                                                                           const LLUUID& im_session_id)
@@ -1701,8 +1689,6 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
                 }
                 else 
                 {
-                        LLGiveInventoryInfo* info = NULL;
-                        info = new LLGiveInventoryInfo(to_agent, cat->getUUID(), im_session_id);
                         LLSD args;
                         args["COUNT"] = llformat("%d",giveable.countNoCopy());
                         LLSD payload;