merge

1 files changed, 13 insertions, 10 deletions

diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp
index 12086dad5f..d307a31843 100755
--- a/indra/newview/lltooldraganddrop.cpp
+++ b/indra/newview/lltooldraganddrop.cpp
@@ -1611,16 +1611,19 @@ static void show_item_sharing_confirmation(const std::string name,
 		llassert(NULL != inv_item);
 		return;
 	}
-
-	LLSD substitutions;
-	substitutions["RESIDENTS"] = name;
-	substitutions["ITEMS"] = inv_item->getName();
-	LLSD payload;
-	payload["agent_id"] = dest_agent;
-	payload["item_id"] = inv_item->getUUID();
-	payload["session_id"] = session_id;
-	payload["d&d_dest"] = dest.asString();
-	LLNotificationsUtil::add("ShareItemsConfirmation", substitutions, payload, &give_inventory_cb);
+	if(gInventory.getItem(inv_item->getUUID())
+		&& LLGiveInventory::isInventoryGiveAcceptable(inv_item))
+	{
+		LLSD substitutions;
+		substitutions["RESIDENTS"] = name;
+		substitutions["ITEMS"] = inv_item->getName();
+		LLSD payload;
+		payload["agent_id"] = dest_agent;
+		payload["item_id"] = inv_item->getUUID();
+		payload["session_id"] = session_id;
+		payload["d&d_dest"] = dest.asString();
+		LLNotificationsUtil::add("ShareItemsConfirmation", substitutions, payload, &give_inventory_cb);
+	}
 }
 
 static void get_name_cb(const LLUUID& id,