diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 9ba6bb8724..8b37f15a77 100755
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -149,6 +149,9 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 	mEnableCallbackRegistrar.add("Inventory.SortBy.Check", boost::bind(&LLPanelMainInventory::isSortByChecked, this, _2));
 	// </FS:Zi> Sort By menu handlers
 
+	// <FS:Ansariel> Add handler for being able to directly route to onCustomAction
+	mCommitCallbackRegistrar.add("Inventory.CustomAction", boost::bind(&LLPanelMainInventory::onCustomAction, this, _2));
+
 	mSavedFolderState = new LLSaveFolderState();
 	mSavedFolderState->setApply(FALSE);
 
diff --git a/indra/newview/skins/default/xui/de/menu_inventory.xml b/indra/newview/skins/default/xui/de/menu_inventory.xml
index 244f5364ce..bddbd543aa 100755
--- a/indra/newview/skins/default/xui/de/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/de/menu_inventory.xml
@@ -65,6 +65,7 @@
 	<menu_item_call label="Kopieren" name="Copy"/>
 	<menu_item_call label="Einfügen" name="Paste"/>
 	<menu_item_call label="Als Link einfügen" name="Paste As Link"/>
+	<menu_item_call label="Alle Links suchen" name="Find Links"/>
 	<menu_item_call label="Links ersetzen" name="Replace Links"/>
 	<menu_item_call label="Löschen" name="Remove Link"/>
 	<menu_item_call label="Löschen" name="Delete"/>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml
index 30c1d4853a..2dcf155e46 100755
--- a/indra/newview/skins/default/xui/en/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory.xml
@@ -500,6 +500,14 @@
          function="Inventory.DoToSelected"
          parameter="paste_link" />
     </menu_item_call>
+    <menu_item_call 
+     label="Find All Links"
+     layout="topleft"
+     name="Find Links">
+        <menu_item_call.on_click
+         function="Inventory.CustomAction"
+         parameter="find_links" />
+    </menu_item_call>
     <menu_item_call
      label="Replace Links"
      layout="topleft"