Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge in select parts of https://bitbucket.org/Kitty_Barnett/rlva-development @ 1adfc2cd210c4cf3a8800b31915d363bfe47d045

Browse Source
This commit is contained in:
Shyotl
2015-06-26 20:59:31 -05:00
parent 4d61305095
commit a380161283
27 changed files with 714 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/rlvfloaters.cpp
View File

@@ -43,9 +43,15 @@
std::string rlvGetItemName(const LLViewerInventoryItem* pItem)
{
if ( (pItem) && ((LLAssetType::AT_BODYPART == pItem->getType()) || (LLAssetType::AT_CLOTHING == pItem->getType())) )
{
return llformat("%s (%s)", pItem->getName().c_str(), LLWearableType::getTypeName(pItem->getWearableType()).c_str());
}
else if ( (pItem) && (LLAssetType::AT_OBJECT == pItem->getType()) && (isAgentAvatarValid()) )
return llformat("%s (%s)", pItem->getName().c_str(), gAgentAvatarp->getAttachedPointName(pItem->getUUID()).c_str());
{
std::string strAttachPtName;
gAgentAvatarp->getAttachedPointName(pItem->getUUID(), strAttachPtName);
return llformat("%s (%s)", pItem->getName().c_str(), strAttachPtName.c_str());
}
return (pItem) ? pItem->getName() : LLStringUtil::null;
}