Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove no-link support more.

Browse Source
This commit is contained in:
Inusaito Sayori
2015-08-12 20:08:43 -04:00
parent 9c06d76b1e
commit b16058dc83
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llagentwearables.cpp
View File

@@ -1941,11 +1941,10 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra
} }
const LLInventoryItem* item = obj_item_array.at(i).get(); const LLInventoryItem* item = obj_item_array.at(i).get();
bool replace = !gHippoGridManager->getConnectedGrid()->supportsInvLinks();
msg->nextBlockFast(_PREHASH_ObjectData ); msg->nextBlockFast(_PREHASH_ObjectData );
msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID()); msg->addUUIDFast(_PREHASH_ItemID, item->getLinkedUUID());
msg->addUUIDFast(_PREHASH_OwnerID, item->getPermissions().getOwner()); 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) // [RLVa:KB] - Checked: 2011-05-22 (RLVa-1.3.1)
if ( (rlv_handler_t::isEnabled()) && (sInitialAttachmentsRequested) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_ANY)) ) if ( (rlv_handler_t::isEnabled()) && (sInitialAttachmentsRequested) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_ANY)) )
{ {

9
indra/newview/llinventorybridge.cpp
View File

@@ -3573,15 +3573,13 @@ void build_context_menu_folder_options(LLInventoryModel* model, const LLUUID& mU
// Only enable add/replace outfit for non-system folders. // Only enable add/replace outfit for non-system folders.
if (!is_system_folder) if (!is_system_folder)
{ {
if (InventoryLinksEnabled() /*&&
// Adding an outfit onto another (versus replacing) doesn't make sense. // Adding an outfit onto another (versus replacing) doesn't make sense.
// <singu/> Actually, it does make a bit of sense, in some cases. // <singu/> Actually, it does make a bit of sense, in some cases.
!is_outfit*/) //if(!is_outfit)
{ {
items.push_back(std::string("Add To 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")); 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 Separator"));
items.push_back(std::string("Wearable And Object Wear")); 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"));
items.push_back(std::string("Attach To HUD")); items.push_back(std::string("Attach To HUD"));
// commented out for DEV-32347 - AND Commented back in for non-morons. -HgB // commented out for DEV-32347 - AND Commented back in for non-morons. -HgB