1 files changed, 152 insertions, 47 deletions

diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index c83d0f4..156093a 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -66,6 +67,7 @@
 #include "llvolume.h"
 #include "llworld.h"
 #include "object_flags.h"
+#include "llimview.h"
 
 
 // MAX ITEMS is based on (sizeof(uuid)+2) * count must be < MTUBYTES
@@ -953,7 +955,7 @@ void LLToolDragAndDrop::pickCallback(const LLPickInfo& pick_info)
 
                 if(hit_obj->isAvatar())
                 {
-                        if(((LLVOAvatar*) hit_obj)->mIsSelf)
+                        if(((LLVOAvatar*) hit_obj)->isSelf())
                         {
                                 target = DT_SELF;
                                 hit_face = -1;
@@ -1051,9 +1053,9 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj,
         if (hit_obj->isInventoryDirty())
         {
                 hit_obj->fetchInventoryFromServer();
-                LLStringUtil::format_map_t args;
-                args["[ERROR_MESSAGE]"] = "Unable to add texture.\nPlease wait a few seconds and try again.";
-                gViewerWindow->alertXml("ErrorMessage", args);
+                LLSD args;
+                args["ERROR_MESSAGE"] = "Unable to add texture.\nPlease wait a few seconds and try again.";
+                LLNotifications::instance().add("ErrorMessage", args);
                 return FALSE;
         }
         if (hit_obj->getInventoryItemByAsset(item->getAssetUUID()))
@@ -1478,12 +1480,18 @@ struct LLGiveInventoryInfo
 {
         LLUUID mToAgentID;
         LLUUID mInventoryObjectID;
-        LLGiveInventoryInfo(const LLUUID& to_agent, const LLUUID& obj_id) :
-                mToAgentID(to_agent), mInventoryObjectID(obj_id) {}
+        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)
+                                                                          LLInventoryItem* item,
+                                                                          const LLUUID& im_session_id)
+                                                                          
 {
         llinfos << "LLToolDragAndDrop::giveInventory()" << llendl;
         if(!isInventoryGiveAcceptable(item))
@@ -1493,53 +1501,53 @@ void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent,
         if(item->getPermissions().allowCopyBy(gAgent.getID()))
         {
                 // just give it away.
-                LLToolDragAndDrop::commitGiveInventoryItem(to_agent, item);
+                LLToolDragAndDrop::commitGiveInventoryItem(to_agent, item, im_session_id);
         }
         else
         {
                 // ask if the agent is sure.
-                LLGiveInventoryInfo* info = new LLGiveInventoryInfo(to_agent,
-                                                                    item->getUUID());
-
-                gViewerWindow->alertXml("CannotCopyWarning",
-                                        &LLToolDragAndDrop::handleCopyProtectedItem,
-                                        (void*)info);
+                LLSD payload;
+                payload["agent_id"] = to_agent;
+                payload["item_id"] = item->getUUID();
+                LLNotifications::instance().add("CannotCopyWarning", LLSD(), payload, 
+                        &LLToolDragAndDrop::handleCopyProtectedItem);
         }
 }
-
 // static
-void LLToolDragAndDrop::handleCopyProtectedItem(S32 option, void* data)
+bool LLToolDragAndDrop::handleCopyProtectedItem(const LLSD& notification, const LLSD& response)
 {
-        LLGiveInventoryInfo* info = (LLGiveInventoryInfo*)data;
+        S32 option = LLNotification::getSelectedOption(notification, response);
         LLInventoryItem* item = NULL;
         switch(option)
         {
         case 0:  // "Yes"
-                item = gInventory.getItem(info->mInventoryObjectID);
+                item = gInventory.getItem(notification["payload"]["item_id"].asUUID());
                 if(item)
                 {
-                        LLToolDragAndDrop::commitGiveInventoryItem(info->mToAgentID,
+                        LLToolDragAndDrop::commitGiveInventoryItem(notification["payload"]["agent_id"].asUUID(),
                                                                                                            item);
                         // delete it for now - it will be deleted on the server
                         // quickly enough.
-                        gInventory.deleteObject(info->mInventoryObjectID);
+                        gInventory.deleteObject(notification["payload"]["item_id"].asUUID());
                         gInventory.notifyObservers();
                 }
                 else
                 {
-                        gViewerWindow->alertXml("CannotGiveItem");              
+                        LLNotifications::instance().add("CannotGiveItem");              
                 }
                 break;
 
         default: // no, cancel, whatever, who cares, not yes.
-                gViewerWindow->alertXml("TransactionCancelled");
+                LLNotifications::instance().add("TransactionCancelled");
                 break;
         }
+        return false;
 }
 
 // static
 void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
-                                                                                                LLInventoryItem* item)
+                                                                                                LLInventoryItem* item,
+                                                                                                const LLUUID& im_session_id)
 {
         if(!item) return;
         std::string name;
@@ -1578,10 +1586,20 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent,
         gFloaterTools->dirty();
 
         LLMuteList::getInstance()->autoRemove(to_agent, LLMuteList::AR_INVENTORY);
+
+        // If this item was given by drag-and-drop into an IM panel, log this action in the IM panel chat.
+        if (im_session_id != LLUUID::null)
+        {
+                LLSD args;
+                gIMMgr->addSystemMessage(im_session_id, "inventory_item_offered", args);
+        }
+
 }
 
 void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
-                                                                                          LLInventoryCategory* cat)
+                                                                                          LLInventoryCategory* cat,
+                                                                                          const LLUUID& im_session_id)
+
 {
         if(!cat) return;
         llinfos << "LLToolDragAndDrop::giveInventoryCategory() - "
@@ -1614,53 +1632,53 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
         }
         if(!complete)
         {
-                LLNotifyBox::showXml("IncompleteInventory");
+                LLNotifications::instance().add("IncompleteInventory");
                 return;
         }
         count = items.count() + cats.count();
         if(count > MAX_ITEMS)
         {
-                gViewerWindow->alertXml("TooManyItems");
+                LLNotifications::instance().add("TooManyItems");
                 return;
         }
         else if(count == 0)
         {
-                gViewerWindow->alertXml("NoItems");
+                LLNotifications::instance().add("NoItems");
                 return;
         }
         else
         {
                 if(0 == giveable.countNoCopy())
                 {
-                        LLToolDragAndDrop::commitGiveInventoryCategory(to_agent, cat);
+                        LLToolDragAndDrop::commitGiveInventoryCategory(to_agent, cat, im_session_id);
                 }
                 else 
                 {
                         LLGiveInventoryInfo* info = NULL;
-                        info = new LLGiveInventoryInfo(to_agent, cat->getUUID());
-                        LLStringUtil::format_map_t args;
-                        args["[COUNT]"] = llformat("%d",giveable.countNoCopy());
-                        gViewerWindow->alertXml("CannotCopyCountItems", args,
-                                &LLToolDragAndDrop::handleCopyProtectedCategory,
-                                (void*)info);
-                                
+                        info = new LLGiveInventoryInfo(to_agent, cat->getUUID(), im_session_id);
+                        LLSD args;
+                        args["COUNT"] = llformat("%d",giveable.countNoCopy());
+                        LLSD payload;
+                        payload["agent_id"] = to_agent;
+                        payload["folder_id"] = cat->getUUID();
+                        LLNotifications::instance().add("CannotCopyCountItems", args, payload, &LLToolDragAndDrop::handleCopyProtectedCategory);
                 }
         }
 }
 
 
 // static
-void LLToolDragAndDrop::handleCopyProtectedCategory(S32 option, void* data)
+bool LLToolDragAndDrop::handleCopyProtectedCategory(const LLSD& notification, const LLSD& response)
 {
-        LLGiveInventoryInfo* info = (LLGiveInventoryInfo*)data;
+        S32 option = LLNotification::getSelectedOption(notification, response);
         LLInventoryCategory* cat = NULL;
         switch(option)
         {
         case 0:  // "Yes"
-                cat = gInventory.getCategory(info->mInventoryObjectID);
+                cat = gInventory.getCategory(notification["payload"]["folder_id"].asUUID());
                 if(cat)
                 {
-                        LLToolDragAndDrop::commitGiveInventoryCategory(info->mToAgentID,
+                        LLToolDragAndDrop::commitGiveInventoryCategory(notification["payload"]["agent_id"].asUUID(),
                                                                                                                    cat);
                         LLViewerInventoryCategory::cat_array_t cats;
                         LLViewerInventoryItem::item_array_t items;
@@ -1679,19 +1697,22 @@ void LLToolDragAndDrop::handleCopyProtectedCategory(S32 option, void* data)
                 }
                 else
                 {
-                        gViewerWindow->alertXml("CannotGiveCategory");
+                        LLNotifications::instance().add("CannotGiveCategory");
                 }
                 break;
 
         default: // no, cancel, whatever, who cares, not yes.
-                gViewerWindow->alertXml("TransactionCancelled");
+                LLNotifications::instance().add("TransactionCancelled");
                 break;
         }
+        return false;
 }
 
 // static
 void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
-                                                                                                        LLInventoryCategory* cat)
+                                                                                                        LLInventoryCategory* cat,
+                                                                                                        const LLUUID& im_session_id)
+
 {
         if(!cat) return;
         llinfos << "LLToolDragAndDrop::commitGiveInventoryCategory() - "
@@ -1713,12 +1734,12 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
         S32 count = items.count() + cats.count();
         if(count > MAX_ITEMS)
         {
-                gViewerWindow->alertXml("TooManyItems");
+                LLNotifications::instance().add("TooManyItems");
                 return;
         }
         else if(count == 0)
         {
-                gViewerWindow->alertXml("NoItems");
+                LLNotifications::instance().add("NoItems");
                 return;
         }
         else
@@ -1782,6 +1803,13 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent,
                 gFloaterTools->dirty();
 
                 LLMuteList::getInstance()->autoRemove(to_agent, LLMuteList::AR_INVENTORY);
+
+                // If this item was given by drag-and-drop into an IM panel, log this action in the IM panel chat.
+                if (im_session_id != LLUUID::null)
+                {
+                        LLSD args;
+                        gIMMgr->addSystemMessage(im_session_id, "inventory_item_offered", args);
+                }
         }
 }
 
@@ -1942,6 +1970,82 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL
         return ACCEPT_NO;
 }
 
+
+// function used as drag-and-drop handler for simple agent give inventory requests
+//static
+bool LLToolDragAndDrop::handleGiveDragAndDrop(LLUUID dest_agent, LLUUID session_id, BOOL drop,
+                                                                                          EDragAndDropType cargo_type,
+                                                                                          void* cargo_data,
+                                                                                          EAcceptance* accept)
+{
+        // check the type
+        switch(cargo_type)
+        {
+        case DAD_TEXTURE:
+        case DAD_SOUND:
+        case DAD_LANDMARK:
+        case DAD_SCRIPT:
+        case DAD_OBJECT:
+        case DAD_NOTECARD:
+        case DAD_CLOTHING:
+        case DAD_BODYPART:
+        case DAD_ANIMATION:
+        case DAD_GESTURE:
+        {
+                LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data;
+                if(gInventory.getItem(inv_item->getUUID())
+                   && LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item))
+                {
+                        // *TODO: get multiple object transfers working
+                        *accept = ACCEPT_YES_COPY_SINGLE;
+                        if(drop)
+                        {
+                                LLToolDragAndDrop::giveInventory(dest_agent, inv_item, session_id);
+                        }
+                }
+                else
+                {
+                        // It's not in the user's inventory (it's probably
+                        // in an object's contents), so disallow dragging
+                        // it here.  You can't give something you don't
+                        // yet have.
+                        *accept = ACCEPT_NO;
+                }
+                break;
+        }
+        case DAD_CATEGORY:
+        {
+                LLViewerInventoryCategory* inv_cat = (LLViewerInventoryCategory*)cargo_data;
+                if( gInventory.getCategory( inv_cat->getUUID() ) )
+                {
+                        // *TODO: get multiple object transfers working
+                        *accept = ACCEPT_YES_COPY_SINGLE;
+                        if(drop)
+                        {
+                                LLToolDragAndDrop::giveInventoryCategory(dest_agent, inv_cat, session_id);
+                        }
+                }
+                else
+                {
+                        // It's not in the user's inventory (it's probably
+                        // in an object's contents), so disallow dragging
+                        // it here.  You can't give something you don't
+                        // yet have.
+                        *accept = ACCEPT_NO;
+                }
+                break;
+        }
+        case DAD_CALLINGCARD:
+        default:
+                *accept = ACCEPT_NO;
+                break;
+        }
+
+        return TRUE;
+}
+
+
+
 ///
 /// Methods called in the drag & drop array
 ///
@@ -2281,7 +2385,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearItem(
                         // destroy clothing items.
                         if (!gAgent.areWearablesLoaded()) 
                         {
-                                gViewerWindow->alertXml("CanNotChangeAppearanceUntilLoaded");
+                                LLNotifications::instance().add("CanNotChangeAppearanceUntilLoaded");
                                 return ACCEPT_NO;
                         }
 
@@ -2376,7 +2480,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory(
                 // destroy clothing items.
                 if (!gAgent.areWearablesLoaded()) 
                 {
-                        gViewerWindow->alertXml("CanNotChangeAppearanceUntilLoaded");
+                        LLNotifications::instance().add("CanNotChangeAppearanceUntilLoaded");
                         return ACCEPT_NO;
                 }
         }
@@ -2885,6 +2989,7 @@ LLInventoryObject* LLToolDragAndDrop::locateMultipleInventory(LLViewerInventoryC
 
 void pack_permissions_slam(LLMessageSystem* msg, U32 flags, const LLPermissions& perms)
 {
+        // CRUFT -- the server no longer pays attention to this data
         U32 group_mask          = perms.getMaskGroup();
         U32 everyone_mask       = perms.getMaskEveryone();
         U32 next_owner_mask     = perms.getMaskNextOwner();