summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-10-23 06:20:10 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-10-23 06:20:10 -0400
commitb99d57fbdeda3f012e090bb610f9d3fb44f4248f (patch)
tree52e674e2757374c6e60675b29c878f400714b813 /indra/newview/llwearableitemslist.cpp
parent920b6de4b1b2234b356258dc7ea1fb108d648cea (diff)
MAINT-4196 WIP, including clearer inventory warnings for attachment errors
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
-rwxr-xr-xindra/newview/llwearableitemslist.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index ca60b79f9d..fac0fd63ee 100755
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -364,8 +364,14 @@ void LLPanelAttachmentListItem::updateItem(const std::string& 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 = title_joint + " (" + joint + ")";
+ std::string found_name;
+ bool found = gAgentAvatarp->getAttachedPointName(inv_item->getLinkedUUID(),found_name);
+ std::string trans_name = LLTrans::getString(found_name);
+ if (!found)
+ {
+ LL_WARNS() << "invalid attachment joint, err " << found_name << LL_ENDL;
+ }
+ title_joint = title_joint + " (" + trans_name + ")";
}
LLPanelInventoryListItemBase::updateItem(title_joint, item_state);