From 34fb647903e9e89a3ca20e2c765d073f648de4b8 Mon Sep 17 00:00:00 2001
From: Siana Gearz <siana.sg@live.de>
Date: Mon, 7 Nov 2011 05:34:12 +0100
Subject: [PATCH] Fix unable to delete links and make more purdy

---
 indra/newview/llagentwearables.cpp                 |  3 +++
 indra/newview/llinventorybridge.cpp                |  4 ++--
 .../skins/default/xui/en-us/menu_inventory.xml     | 14 +++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp
index 886348d1a..e625e1b4c 100644
--- a/indra/newview/llagentwearables.cpp
+++ b/indra/newview/llagentwearables.cpp
@@ -1130,6 +1130,9 @@ void LLAgentWearables::makeNewOutfit(
 			if( old_wearable )
 			{
 				LLViewerInventoryItem* item = gInventory.getItem(getWearableItemID((LLWearableType::EType)index));
+				llassert(item);
+				if (!item)
+					continue;
 				if (fUseOutfits)
 				{
 					std::string strOrdering = llformat("@%d", item->getWearableType() * 100);
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 94e3a4d73..9bbbf0b8f 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -797,7 +797,7 @@ void LLInvFVBridge::addDeleteContextMenuOptions(menuentry_vec_t &items,
 	}
 
 	// "Remove link" and "Delete" are the same operation.
-	if (obj && obj->getIsLinkType() && !get_is_item_worn(mUUID))
+	if (obj && obj->getIsLinkType() /* && !get_is_item_worn(mUUID)*/)
 	{
 		items.push_back(std::string("Remove Link"));
 	}
@@ -4289,7 +4289,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 				
 				if (!avatarp->canAttachMoreObjects())
 				{
-					disabled_items.push_back(std::string("Object Wea"));
+					disabled_items.push_back(std::string("Object Wear"));
 					disabled_items.push_back(std::string("Object Add"));
 					disabled_items.push_back(std::string("Attach To"));
 					disabled_items.push_back(std::string("Attach To HUD"));
diff --git a/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 9265e688a..c34e9fe34 100644
--- a/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -198,7 +198,15 @@
 	     name="Paste As Link" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="paste_link" />
 	</menu_item_call>
+	<menu_item_call bottom_delta="-18" height="18" label="Restore in World" left="0" mouse_opaque="true"
+	     name="Restore to Last Position" width="128">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
+	</menu_item_call>
 	<menu_item_separator name="Paste Separator" />
+	<menu_item_call bottom_delta="-18" height="18" label="Remove Link" left="0" mouse_opaque="true"
+	     name="Remove Link" width="128">
+		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
+	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Delete" left="0" mouse_opaque="true"
 	     name="Delete" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="delete" />
@@ -267,10 +275,6 @@
 		<on_click filter="" function="Inventory.DoToSelected" userdata="deactivate" />
 	</menu_item_call>
 	<menu_item_separator name="Attach Separator" />
-	<menu_item_call bottom_delta="-18" height="18" label="Restore in World" left="0" mouse_opaque="true"
-	     name="Restore to Last Position" width="128">
-		<on_click filter="" function="Inventory.DoToSelected" userdata="restoreToWorld" />
-	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Wear" left="0" mouse_opaque="true"
 	     name="Object Wear" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="attach" />
@@ -302,5 +306,5 @@
 	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="--no options--" left="0"
 	     mouse_opaque="true" name="--no options--" width="128" />
-	<menu_item_separator name="Wearable Separator" />
+	<--menu_item_separator name="Wearable Separator" /-->
 </menu>