From 0a1fc862f785bf8a4487d9bb56baaf9f29a64ce0 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Wed, 19 Aug 2026 20:27:43 +0300
Subject: #6130 Fix combo box in inventory settings
Combo box doesn't translate bools right and isn't meant to. Switch to U32.
---
indra/newview/app_settings/settings.xml | 2 +-
indra/newview/llinventorybridge.cpp | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index e50234d26a..60e5faff66 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -16392,7 +16392,7 @@
Persist
1
Type
- Boolean
+ U32
Value
0
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 58ca1da032..ab731e852b 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -7214,8 +7214,8 @@ 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.
+ static LLCachedControl add_attachment_behavior(gSavedSettings, "InventoryAddAttachmentBehavior", 0);
+ rez_attachment(item, NULL, ("attach" == action) ? (add_attachment_behavior() == 1) : true); // Replace if "Wear"ing.
}
else if(item && item->isFinished())
{
@@ -8363,8 +8363,8 @@ void LLObjectBridgeAction::attachOrDetach()
}
else
{
- static LLCachedControl inventory_linking(gSavedSettings, "InventoryAddAttachmentBehavior", false);
- LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, inventory_linking()); // Don't replace if adding.
+ static LLCachedControl add_attachment_behavior(gSavedSettings, "InventoryAddAttachmentBehavior", 0);
+ LLAppearanceMgr::instance().wearItemOnAvatar(mUUID, true, add_attachment_behavior() == 1); // Don't replace if adding.
}
}
--
cgit v1.3