diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-03-19 09:46:24 -0700 |
| commit | 40e04fdb3b416a686c66989ee5d44c5eaf97b9fd (patch) | |
| tree | 537b95c75bdb4a96a9f663895f89cb73f54c8f67 /indra/newview/llinventorybridge.cpp | |
| parent | 70df3c1fa72ae8ecddf144452b4fe032ad48182e (diff) | |
| parent | 1a28e325c4d148d2322bc9becb672abf99315a96 (diff) | |
Merge with tip
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); } |