From ff7f3c348d5b08dfa817ebe2c9e1405879a5b8be Mon Sep 17 00:00:00 2001
From: Loren Shih <seraph@lindenlab.com>
Date: Mon, 7 Dec 2009 13:06:24 -0500
Subject: EXT-3124 : Add lookup for finding all linked items to an item

Commented this feature out since the viewer can't ask the server to change assetIDs of its inventory items.

--HG--
branch : avatar-pipeline
---
 indra/newview/llpanelmaininventory.cpp                        |  3 ++-
 indra/newview/llviewerinventory.cpp                           |  4 +++-
 .../skins/default/xui/en/menu_inventory_gear_default.xml      | 11 -----------
 3 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 44d32cdc99..9fd92725dc 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -966,6 +966,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 			preview_texture->openToSave();
 		}
 	}
+	// This doesn't currently work, since the viewer can't change an assetID an item.
 	if (command_name == "regenerate_link")
 	{
 		LLInventoryPanel *active_panel = getActivePanel();
@@ -1065,7 +1066,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 		}
 		return FALSE;
 	}
-
+	// This doesn't currently work, since the viewer can't change an assetID an item.
 	if (command_name == "regenerate_link")
 	{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 3019d714fd..5da77ecdb9 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -1481,6 +1481,8 @@ LLUUID find_possible_item_for_regeneration(const LLViewerInventoryItem *target_i
 	return LLUUID::null;
 }
 
+// This currently dosen't work, because the sim does not allow us 
+// to change an item's assetID.
 BOOL LLViewerInventoryItem::regenerateLink()
 {
 	const LLUUID target_item_id = find_possible_item_for_regeneration(this);
@@ -1489,7 +1491,7 @@ BOOL LLViewerInventoryItem::regenerateLink()
 	LLViewerInventoryCategory::cat_array_t cats;
 	LLViewerInventoryItem::item_array_t items;
 	LLAssetIDMatches asset_id_matches(getAssetUUID());
-	gInventory.collectDescendentsIf(LLUUID::null,
+	gInventory.collectDescendentsIf(gInventory.getRootFolderID(),
 									cats,
 									items,
 									LLInventoryModel::EXCLUDE_TRASH,
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index e5592c3c57..4e6a07d020 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -111,15 +111,4 @@
 			 function="Inventory.GearDefault.Enable"
 			 parameter="find_links" />
         </menu_item_call>
-    <menu_item_call 
-         label="Regenerate Link"
-         layout="topleft"
-         name="Regenerate Link">
-            <on_click
-             function="Inventory.GearDefault.Custom.Action"
-             parameter="regenerate_link" />
-            <on_enable
-			 function="Inventory.GearDefault.Enable"
-			 parameter="regenerate_link" />
-        </menu_item_call>
 </menu>
-- 
cgit v1.2.3