Commits

leslie_linden  committed 4458a72

EXP-1799 FIX -- Replace and Add to Outfit options appear as grayed out in Inventory

* Modified build context menu code to not disable items that are invisible so
secondary background fetch can coalesce menu options with proper state.
* Removed "Move to Merchant Outbox" context menu option.

  • Participants
  • Parent commits bf853d3

Comments (0)

Files changed (2)

File indra/newview/llinventorybridge.cpp

 			{
 				menu_item->setVisible(FALSE);
 			}
-			menu_item->setEnabled(FALSE);
 		}
 		else
 		{
 			// so that some other UI element from multi-select doesn't later set this invisible.
 			menu_item->pushVisible(TRUE);
 
-			BOOL enabled = menu_item->getEnabled();
-			for (itor2 = disabled_entries.begin(); itor2 != disabled_entries.end(); ++itor2)
+			bool enabled = (menu_item->getEnabled() == TRUE);
+			for (itor2 = disabled_entries.begin(); enabled && (itor2 != disabled_entries.end()); ++itor2)
 			{
-				if (*itor2 == name)
-				{
-					enabled = FALSE;
-					break;
-				}
+				enabled &= (*itor2 != name);
 			}
 
 			menu_item->setEnabled(enabled);
 					copyable = inv_item->getPermissions().allowCopyBy(gAgent.getID());
 				}
 
-				const std::string merchant_action = ((copyable == true) ? "Merchant Copy" : "Merchant Move");
-				items.push_back(merchant_action);
-
+				items.push_back(std::string("Merchant Copy"));
 				if (!canListOnMarketplaceNow())
 				{
-					disabled_items.push_back(merchant_action);
+					disabled_items.push_back(std::string("Merchant Copy"));
 				}
 			}
 		}

File indra/newview/skins/default/xui/en/menu_inventory.xml

 		 parameter="copy_to_outbox" />
 	</menu_item_call>
 	<menu_item_call
-	 label="Move to Merchant Outbox"
-	 layout="topleft"
-	 name="Merchant Move">
-		<menu_item_call.on_click
-		 function="Inventory.DoToSelected"
-		 parameter="move_to_outbox" />
-	</menu_item_call>
-	<menu_item_call
 	 label="Send to Marketplace"
 	 layout="topleft"
 	 name="Marketplace Send">