diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-03-19 13:21:52 -0400 |
commit | a3a430651780f82afb0fd355a0abe11d88f410d6 (patch) | |
tree | a2ec3b87b2bff75904be0e7a6bf38d17c59edb68 /indra/newview/llinventorybridge.cpp | |
parent | b952a5e5851d1a8bc2a45f00248b051497fec71f (diff) | |
parent | f50be64167c254e27f635ad47d8940551f0c6ab4 (diff) |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 1f918c72ea..6fedd9ac4d 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -103,7 +103,7 @@ std::string ICON_NAME[ICON_NAME_COUNT] = "Inv_Script", "Inv_Clothing", "Inv_Object", - "Inv_Object", + "Inv_Object_Multi", "Inv_Notecard", "Inv_Skin", "Inv_Snapshot", @@ -5358,7 +5358,10 @@ LLUIImagePtr LLLinkItemBridge::getIcon() const { if (LLViewerInventoryItem *item = getItem()) { - return get_item_icon(item->getActualType(), item->getInventoryType(), 0, FALSE); + U32 attachment_point = (item->getFlags() & 0xff); // low byte of inventory flags + bool is_multi = LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & item->getFlags(); + + return get_item_icon(item->getActualType(), item->getInventoryType(), attachment_point, is_multi); } return get_item_icon(LLAssetType::AT_LINK, LLInventoryType::IT_NONE, 0, FALSE); } |