summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-03 10:49:07 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-03 10:49:07 +0100
commitd3060e64a2aee975320e10a6c240387f04dc973c (patch)
tree7e775a7964d7574cf2cbe462137675ad1ee23ed6 /indra/newview/llwearableitemslist.cpp
parentb8daec6144bfe064eb9b43e776ec21f997de2923 (diff)
parentdaec4f6bb75634c6355f58d9fa5ef60f50a2e73f (diff)
merge from PE's viewer-release. conflicts resolved.
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
-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 d24bd8499d..9f9a9bef35 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);