diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-11 11:27:36 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-11 11:27:36 -0400 |
commit | 8e725a8694f8537d696a6943ea2323c56a5fa169 (patch) | |
tree | 24d34b7bd9446919fa86d2d462c8230d02b638b0 /indra/newview/llinventoryitemslist.cpp | |
parent | 59b4f7e25899e5f14cc6d1eb1f7f683ae6821657 (diff) | |
parent | 0c8164b8947eee7b43ba0452821a3ff6d9f9dd38 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llinventoryitemslist.cpp')
-rw-r--r-- | indra/newview/llinventoryitemslist.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp index 3e5f8d9848..55cb2619cf 100644 --- a/indra/newview/llinventoryitemslist.cpp +++ b/indra/newview/llinventoryitemslist.cpp @@ -79,7 +79,15 @@ void LLPanelInventoryListItemBase::draw() void LLPanelInventoryListItemBase::updateItem() { setIconImage(mIconImage); - setTitle(mItem->getName(), mHighlightedText); + + std::string name = mItem->getName(); + + if (get_is_item_worn(mItem->getUUID())) + { + name += LLTrans::getString("worn"); + } + + setTitle(name, mHighlightedText); } void LLPanelInventoryListItemBase::addWidgetToLeftSide(const std::string& name, bool show_widget/* = true*/) |