diff options
| author | Maxim Nikolenko <maximnproductengine@lindenlab.com> | 2025-01-29 01:06:31 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-04-11 00:33:13 +0300 |
| commit | dab8b9c62300e897c9b3f5826cdc6419c64ee1a5 (patch) | |
| tree | 8f568c0dbf97d83aabef5489fcd8b6a7152a244b /indra | |
| parent | 154d15d42d4ca200dec9e404464cf86eaa384a32 (diff) | |
#3383 'InventoryAddAttachmentBehavior' setting should affect inventory panel in List view; update persistence of new settings
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 8 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index e0d253c7fc..bc64222b22 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -16041,7 +16041,7 @@ <key>Comment</key> <string>Show star near favorited items in inventory</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> @@ -16052,7 +16052,7 @@ <key>Comment</key> <string>Show star near folders that contain favorites</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> @@ -16063,7 +16063,7 @@ <key>Comment</key> <string>render favorite items using InventoryFavoriteText as color</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> @@ -16074,7 +16074,7 @@ <key>Comment</key> <string>Defines behavior when hitting return on an inventory item</string> <key>Persist</key> - <integer>0</integer> + <integer>1</integer> <key>Type</key> <string>Boolean</string> <key>Value</key> diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 7480956fab..8417bdb234 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -6939,7 +6939,8 @@ void LLObjectBridge::performAction(LLInventoryModel* model, std::string action) item = (LLViewerInventoryItem*)gInventory.getItem(object_id); if(item && gInventory.isObjectDescendentOf(object_id, gInventory.getRootFolderID())) { - rez_attachment(item, NULL, true); // Replace if "Wear"ing. + static LLCachedControl<bool> replace_item(gSavedSettings, "InventoryAddAttachmentBehavior", false); + rez_attachment(item, NULL, ("attach" == action) ? replace_item() : true); // Replace if "Wear"ing. } else if(item && item->isFinished()) { |