summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2010-07-02 17:41:42 +0300
committerAlexei Arabadji <aarabadji@productengine.com>2010-07-02 17:41:42 +0300
commit018ff76192fe13dcc1410f66833a07f6876db3b0 (patch)
tree08049d52b07fbb6e6c5a1a354e594ea16d4591d2
parent41ac3f8f220f32cd36dd61a026d61345a6b9c424 (diff)
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
-rw-r--r--indra/newview/llwearableitemslist.cpp4
1 files changed, 2 insertions, 2 deletions
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);