summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerattachmenu.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2025-08-23 10:27:46 -0700
committerRider Linden <rider@lindenlab.com>2025-08-23 10:27:46 -0700
commit375158eb6450a0291ec1a0f55714fbf19a8287eb (patch)
treea3fa4bd843f919575aaddf0928eff38bae7d7b04 /indra/newview/llviewerattachmenu.cpp
parent96023976f5af0b9af8e8d066d9ad4eea213f53ee (diff)
parent37a04baf104aa394615d8e8286522988ba56c09d (diff)
Merge tag 'Second_Life_Release#37a04baf-2025.06' into project/lua_editor
Diffstat (limited to 'indra/newview/llviewerattachmenu.cpp')
-rw-r--r--indra/newview/llviewerattachmenu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerattachmenu.cpp b/indra/newview/llviewerattachmenu.cpp
index f2557e299c..9828ab1fdf 100644
--- a/indra/newview/llviewerattachmenu.cpp
+++ b/indra/newview/llviewerattachmenu.cpp
@@ -116,12 +116,12 @@ void LLViewerAttachMenu::attachObjects(const uuid_vec_t& items, const std::strin
LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getLinkedItem(id);
if(item && gInventory.isObjectDescendentOf(id, gInventory.getRootFolderID()))
{
- rez_attachment(item, attachmentp); // don't replace if called from an "Attach To..." menu
+ rez_attachment(item, attachmentp, false); // don't replace if called from an "Attach To..." menu
}
else if(item && item->isFinished())
{
// must be in library. copy it to our inventory and put it on.
- LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, attachmentp));
+ LLPointer<LLInventoryCallback> cb = new LLBoostFuncInventoryCallback(boost::bind(rez_attachment_cb, _1, attachmentp, false));
copy_inventory_item(gAgent.getID(),
item->getPermissions().getOwner(),
item->getUUID(),