diff options
author | callum <none@none> | 2010-06-10 16:58:02 -0700 |
---|---|---|
committer | callum <none@none> | 2010-06-10 16:58:02 -0700 |
commit | fc6d238884f06951a413004b46569304a9d9280a (patch) | |
tree | 106a4f3e8a3b011d34a97b215070d5cd0a96c069 /indra/newview/llwearableitemslist.cpp | |
parent | 63577b8fe3f2b46da70e373364028ae45faf4e06 (diff) | |
parent | 1065cce5e9db1bd18c2b485024ad360e48cedee2 (diff) |
Default merge
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
-rw-r--r-- | indra/newview/llwearableitemslist.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp index 6c410cf7a5..d56a331000 100644 --- a/indra/newview/llwearableitemslist.cpp +++ b/indra/newview/llwearableitemslist.cpp @@ -89,8 +89,6 @@ void LLPanelWearableListItem::onMouseLeave(S32 x, S32 y, MASK mask) LLPanelWearableListItem::LLPanelWearableListItem(LLViewerInventoryItem* item) : LLPanelInventoryListItemBase(item) { - // icons should not be shown for this type of items (EXT-7511) - mForceNoLinksOnIcons = true; } ////////////////////////////////////////////////////////////////////////// @@ -309,7 +307,7 @@ BOOL LLPanelDummyClothingListItem::postBuild() addWidgetToRightSide("btn_add"); - setIconImage(LLInventoryIcon::getIcon(LLAssetType::AT_CLOTHING, LLInventoryType::IT_NONE, FALSE, mWearableType, FALSE)); + setIconImage(LLInventoryIcon::getIcon(LLAssetType::AT_CLOTHING, LLInventoryType::IT_NONE, mWearableType, FALSE)); updateItem(); // Make it look loke clothing item - reserve space for 'delete' button |