From 018ff76192fe13dcc1410f66833a07f6876db3b0 Mon Sep 17 00:00:00 2001 From: Alexei Arabadji Date: Fri, 2 Jul 2010 17:41:42 +0300 Subject: EXT-8127 FIXED Provided attachment list item name on outfit edit panel even if it unworn. reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/688/ --HG-- branch : product-engine --- indra/newview/llwearableitemslist.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llwearableitemslist.cpp') diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 868322699e..9a76b01853 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -269,13 +269,13 @@ LLPanelAttachmentListItem* LLPanelAttachmentListItem::create(LLViewerInventoryIt void LLPanelAttachmentListItem::updateItem(const std::string& name, EItemState item_state) { - std::string title_joint; + std::string title_joint = name; LLViewerInventoryItem* inv_item = getItem(); if (inv_item && isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(inv_item->getLinkedUUID())) { std::string joint = LLTrans::getString(gAgentAvatarp->getAttachedPointName(inv_item->getLinkedUUID())); - title_joint = name + " (" + joint + ")"; + title_joint = title_joint + " (" + joint + ")"; } LLPanelInventoryListItemBase::updateItem(title_joint, item_state); -- cgit v1.2.3 From e78f96b2fbf7a535b7bc5fe4a0338f354cdae7ed Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Fri, 2 Jul 2010 15:55:49 -0400 Subject: EXT-8213 FIX users cannot replace their shape if it does not load Removed checking for wearables loaded on replacing or adding individual items. After reviewing the code in depth, we believe this is safe to do, particularly since we allow the user to replace their outfit from the same state. Filed a followup issue for later investigation EXT-8231 Code reviewed by Vir and Seraph --- indra/newview/llwearableitemslist.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'indra/newview/llwearableitemslist.cpp') diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 868322699e..d24bd8499d 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -783,10 +783,7 @@ void LLWearableItemsList::ContextMenu::createNewWearable(const LLUUID& item_id) // static bool LLWearableItemsList::ContextMenu::canAddWearable(const LLUUID& item_id) { - if (!gAgentWearables.areWearablesLoaded()) - { - return false; - } + // TODO: investigate wearables may not be loaded at this point EXT-8231 LLViewerInventoryItem* item = gInventory.getItem(item_id); if (!item || item->getType() != LLAssetType::AT_CLOTHING) -- cgit v1.2.3