From b16058dc830f9ee5ef0dab7a3ae87b8177e0c473 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Wed, 12 Aug 2015 20:08:43 -0400 Subject: [PATCH] Remove no-link support more. --- indra/newview/llagentwearables.cpp | 3 +-- indra/newview/llinventorybridge.cpp | 9 +++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index d91ded745..dfed2502c 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -1941,11 +1941,10 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra } const LLInventoryItem* item = obj_item_array.at(i).get(); - bool replace = !gHippoGridManager->getConnectedGrid()->supportsInvLinks(); msg->nextBlockFast(_PREHASH_ObjectData ); msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID()); msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner()); - msg->addU8Fast(_PREHASH_AttachmentPt, replace? 0 : ATTACHMENT_ADD); // Wear at the previous or default attachment point + msg->addU8Fast(_PREHASH_AttachmentPt, ATTACHMENT_ADD); // Wear at the previous or default attachment point // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1) if ( (rlv_handler_t::isEnabled()) && (sInitialAttachmentsRequested) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_ANY)) ) { diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 9ddc4b027..ae883c356 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -3573,15 +3573,13 @@ void build_context_menu_folder_options(LLInventoryModel* model, const LLUUID& mU // Only enable add/replace outfit for non-system folders. if (!is_system_folder) { - if (InventoryLinksEnabled() /*&& // Adding an outfit onto another (versus replacing) doesn't make sense. // Actually, it does make a bit of sense, in some cases. - !is_outfit*/) + //if(!is_outfit) { items.push_back(std::string("Add To Outfit")); } - else //if(!InventoryLinksEnabled()) - items.push_back(std::string("Wearable And Object Wear")); + //items.push_back(std::string("Wearable And Object Wear")); items.push_back(std::string("Replace Outfit")); } @@ -5603,8 +5601,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) { items.push_back(std::string("Wearable And Object Separator")); items.push_back(std::string("Wearable And Object Wear")); - if (InventoryLinksEnabled()) - items.push_back(std::string("Wearable Add")); + items.push_back(std::string("Wearable Add")); items.push_back(std::string("Attach To")); items.push_back(std::string("Attach To HUD")); // commented out for DEV-32347 - AND Commented back in for non-morons. -HgB