From 17f8748d35c9bae8d61e5fedc50e7f01ee6e8d38 Mon Sep 17 00:00:00 2001
From: Techwolf Lupindo <none@none>
Date: Thu, 1 Nov 2012 21:33:10 -0400
Subject: [PATCH] Area Search: Add blacklist to the context menu.

---
 indra/newview/fsareasearch.cpp                | 19 +++++++++++++++++++
 .../default/xui/en/menu_fs_area_search.xml    |  8 ++++++++
 2 files changed, 27 insertions(+)

diff --git a/indra/newview/fsareasearch.cpp b/indra/newview/fsareasearch.cpp
index 26feca1616..2dd9ff6314 100644
--- a/indra/newview/fsareasearch.cpp
+++ b/indra/newview/fsareasearch.cpp
@@ -53,6 +53,7 @@
 #include "fslslbridge.h"
 #include "llcombobox.h"
 #include "llnotificationsutil.h"
+#include "fswsassetblacklist.h"
 
 
 // max number of objects that can be (de-)selected in a single packet.
@@ -1281,6 +1282,7 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata)
 	{
 	case 't': // touch
 	case 's': // script
+	case 'l': // blacklist
 	{
 		std::vector<LLScrollListItem*> selected = mResultList->getAllSelected();
 
@@ -1301,6 +1303,23 @@ bool FSPanelAreaSearchList::onContextMenuItemClick(const LLSD& userdata)
 			case 's': // script
 				FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + (*item_it)->getUUID().asString());
 				break;
+			case 'l': // blacklist
+			{
+				LLUUID object_id = (*item_it)->getUUID();
+				LLViewerObject* objectp = gObjectList.findObject(object_id);
+				if (objectp)
+				{
+					std::string region_name;
+					LLViewerRegion* region = objectp->getRegion();
+					if (region)
+					{
+						region_name = objectp->getRegion()->getName();
+					}
+					FSWSAssetBlacklist::getInstance()->addNewItemToBlacklist(object_id, mFSAreaSearch->mObjectDetails[object_id].name, region_name, LLAssetType::AT_OBJECT);
+					gObjectList.killObject(objectp);
+				}
+			}
+				break;
 			default:
 				break;
 			}
diff --git a/indra/newview/skins/default/xui/en/menu_fs_area_search.xml b/indra/newview/skins/default/xui/en/menu_fs_area_search.xml
index 7881664765..ab35a7ddc9 100644
--- a/indra/newview/skins/default/xui/en/menu_fs_area_search.xml
+++ b/indra/newview/skins/default/xui/en/menu_fs_area_search.xml
@@ -61,6 +61,14 @@
 		 function="AreaSearch.Action"
 		 parameter="delete"/>
 	</menu_item_call>
+	<menu_item_call
+	 label="Blacklist"
+	 layout="topleft"
+	 name="blacklist_object">
+		<menu_item_call.on_click
+		 function="AreaSearch.Action"
+		 parameter="l_blacklist"/>
+	</menu_item_call>
 <!-- <menu_item_separator
 	 layout="topleft"/>  -->
 	<menu_item_call