diff options
| author | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:58:14 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2025-07-18 13:58:14 +0800 |
| commit | 6daacd94d1f53e53417ac24f05b983a2600a964f (patch) | |
| tree | e3727cfb28a5395128f9941afddf8a7098789709 /indra/newview/llappearancemgr.cpp | |
| parent | 83c425fae25058b82d3ee8c8a4bcf10ebb4f5820 (diff) | |
| parent | 09a3bac9436af1b6077fb27885c8c6c645f40a8e (diff) | |
Merge branch 'main' into 2025.05
Diffstat (limited to 'indra/newview/llappearancemgr.cpp')
| -rw-r--r-- | indra/newview/llappearancemgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index e9d455ae53..242d407219 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -4160,6 +4160,8 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove, nul for (uuid_vec_t::const_iterator it = ids_to_remove.begin(); it != ids_to_remove.end(); ++it) { const LLUUID& id_to_remove = *it; + auto attachment = gAgentAvatarp->getWornAttachment(id_to_remove); + if (attachment && attachment->isLocked()) continue; const LLUUID& linked_item_id = gInventory.getLinkedItemID(id_to_remove); LLViewerInventoryItem *item = gInventory.getItem(linked_item_id); if (item && item->getType() == LLAssetType::AT_OBJECT) |