diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-01 18:57:15 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-01 18:57:15 -0500 |
| commit | 4916305ce1ea60c969c12d8dc8e573f3ee933c3f (patch) | |
| tree | e40b7b487243c58e9fd792b48431d03271bfeb25 /indra/newview/llinventorybridge.cpp | |
| parent | dd6fa93d84a267c6367f83c2d7581207e6dd878d (diff) | |
EXT-3029 : Missing icons for broken item link / broken folder link
EXT-3024 : Broken links don't show up in inventory
Mocked up some link icons for broken links. These need to be polished up.
Broken links now have an IT_ (instead of being IT_NONE) so that they're filtered correctly and thus can show up in inventory.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index a44ce07d76..ebb33ef454 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -125,8 +125,8 @@ std::string ICON_NAME[ICON_NAME_COUNT] = "Inv_Animation", "Inv_Gesture", - "inv_item_linkitem.tga", - "inv_item_linkfolder.tga" + "Inv_LinkItem", + "Inv_LinkFolder" }; // +=================================================+ @@ -856,9 +856,6 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type, new_listener = new LLFolderBridge(inventory, uuid); break; case LLAssetType::AT_LINK: - // Only should happen for broken links. - new_listener = new LLLinkItemBridge(inventory, uuid); - break; case LLAssetType::AT_LINK_FOLDER: // Only should happen for broken links. new_listener = new LLLinkItemBridge(inventory, uuid); @@ -5081,7 +5078,7 @@ LLUIImagePtr LLLinkItemBridge::getIcon() const { if (LLViewerInventoryItem *item = getItem()) { - return get_item_icon(item->getActualType(), LLInventoryType::IT_NONE, 0, FALSE); + return get_item_icon(item->getActualType(), item->getInventoryType(), 0, FALSE); } return get_item_icon(LLAssetType::AT_LINK, LLInventoryType::IT_NONE, 0, FALSE); } |