From 40aaa885b72fa6a45bb6a6b98f8e816b4546c3f4 Mon Sep 17 00:00:00 2001 From: PanteraPolnocy Date: Sun, 16 Nov 2025 18:38:07 +0100 Subject: [PATCH] FIRE-35938, FIRE-36013 Unchecking "Add objects on double click" still adds instead of replacing Signed-off-by: PanteraPolnocy --- indra/newview/app_settings/settings.xml | 2 +- indra/newview/llinventorybridge.cpp | 16 ++++++++++++---- .../xui/de/floater_inventory_settings.xml | 4 ++-- .../xui/en/floater_inventory_settings.xml | 14 +++++++------- .../xui/fr/floater_inventory_settings.xml | 4 ++-- .../xui/ja/floater_inventory_settings.xml | 4 ++-- .../xui/pl/floater_inventory_settings.xml | 6 +++--- .../xui/ru/floater_inventory_settings.xml | 4 ++-- .../xui/zh/floater_inventory_settings.xml | 4 ++-- 9 files changed, 33 insertions(+), 25 deletions(-) diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 73effa26aa..cbef67912f 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -23488,7 +23488,7 @@ Change of this parameter will affect the layout of buttons in notification toast InventoryAddAttachmentBehavior Comment - Defines behavior when hitting return on an inventory item + Defines behavior when hitting return on an inventory item (unused in favour of FSDoubleClickAddInventoryObjects) Persist 1 Type diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index bdc89674a5..3572b6dcc0 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -7899,8 +7899,12 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action) item = (LLViewerInventoryItem*)gInventory.getItem(object_id); if(item && gInventory.isObjectDescendentOf(object_id, gInventory.getRootFolderID())) { - static LLCachedControl replace_item(gSavedSettings, "InventoryAddAttachmentBehavior", false); - rez_attachment(item, NULL, ("attach" == action) ? replace_item() : true); // Replace if "Wear"ing. + // Firestorm's replace on double click + // static LLCachedControl replace_item(gSavedSettings, "InventoryAddAttachmentBehavior", false); + // rez_attachment(item, NULL, ("attach" == action) ? replace_item() : true); // Replace if "Wear"ing. + static LLCachedControl replace_item(gSavedSettings, "FSDoubleClickAddInventoryObjects", false); + rez_attachment(item, NULL, ("attach" == action) ? !replace_item : true); // Replace if "Wear"ing. + // } else if(item && item->isFinished()) { @@ -7943,11 +7947,13 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action) void LLObjectBridge::openItem() { + static LLCachedControl replace_item(gSavedSettings, "FSDoubleClickAddInventoryObjects", false); // Double-click add/replace // object double-click action is to wear/unwear object performAction(getInventoryModel(), // Double-click add/replace //get_is_item_worn(mUUID) ? "detach" : "attach"); - get_is_item_worn(mUUID) ? "detach" : gSavedSettings.getBOOL("FSDoubleClickAddInventoryObjects") ? "wear_add" : "attach"); + get_is_item_worn(mUUID) ? "detach" : replace_item ? "wear_add" : "attach"); + // } std::string LLObjectBridge::getLabelSuffix() const @@ -9164,7 +9170,9 @@ void LLObjectBridgeAction::attachOrDetach() // Double-click add/replace option //static LLCachedControl inventory_linking(gSavedSettings, "InventoryAddAttachmentBehavior", false); //LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, inventory_linking()); // Don't replace if adding. - LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, !gSavedSettings.getBOOL("FSDoubleClickAddInventoryObjects")); // Don't replace if adding. + static LLCachedControl replace_item(gSavedSettings, "FSDoubleClickAddInventoryObjects", false); + LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, !replace_item); // Don't replace if adding. + // } } diff --git a/indra/newview/skins/default/xui/de/floater_inventory_settings.xml b/indra/newview/skins/default/xui/de/floater_inventory_settings.xml index 0f5b3aa6d7..45b0575fcd 100644 --- a/indra/newview/skins/default/xui/de/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/de/floater_inventory_settings.xml @@ -32,7 +32,7 @@ Drücken von Eingabetaste bei einem Avatar-Anhang - - + + diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml index c14c3e5fc6..9f5ec81872 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml @@ -278,11 +278,11 @@ name="attachment_return_txt" font="SansSerifMedium" text_color="White" - width="350"> - Pressing enter on an avatar attachment + width="420"> + Pressing enter or double clicking on an avatar attachment - + diff --git a/indra/newview/skins/default/xui/fr/floater_inventory_settings.xml b/indra/newview/skins/default/xui/fr/floater_inventory_settings.xml index dafc61543a..e0a1120f0c 100644 --- a/indra/newview/skins/default/xui/fr/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/fr/floater_inventory_settings.xml @@ -32,7 +32,7 @@ Appuyer sur Entrée sur un élément attaché à l'avatar - - + + diff --git a/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml b/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml index 68c98401fc..2d2f9857c7 100644 --- a/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/ja/floater_inventory_settings.xml @@ -32,7 +32,7 @@ アバターの装着物でEnterキーを押したときの動作 - - + + diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_settings.xml b/indra/newview/skins/default/xui/pl/floater_inventory_settings.xml index 449faec7d1..47bd8976de 100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_settings.xml @@ -29,10 +29,10 @@ - Naciśnięcie "Enter" na dodatku awatara + Naciśnięcie "Enter" lub podwójne klikanie na dodatku awatara - - + + diff --git a/indra/newview/skins/default/xui/ru/floater_inventory_settings.xml b/indra/newview/skins/default/xui/ru/floater_inventory_settings.xml index 4f1b942ea6..66ce178b38 100644 --- a/indra/newview/skins/default/xui/ru/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/ru/floater_inventory_settings.xml @@ -32,7 +32,7 @@ Нажатие Enter при прикреплении аватара - - + + diff --git a/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml b/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml index a0be5f740b..12d4f5671f 100644 --- a/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/zh/floater_inventory_settings.xml @@ -32,7 +32,7 @@ 在化身附件上按下“Enter”鍵 - - + + \ No newline at end of file