summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-06-04 13:23:12 -0700
committerLeyla Farazha <leyla@lindenlab.com>2010-06-04 13:23:12 -0700
commitb1b4e56bcec6718a971f01d51ffe4363e8fba9ac (patch)
tree82b763d1ed3782fe9ec3f6f0c5f17f2bc0abf7a3 /indra/newview/llwearableitemslist.cpp
parentc393383f4463f40e4574968c0b440c51022be7b9 (diff)
parent6d840687a5306f9234444ed1bde1f6b877da3996 (diff)
Merge
Diffstat (limited to 'indra/newview/llwearableitemslist.cpp')
-rw-r--r--indra/newview/llwearableitemslist.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llwearableitemslist.cpp b/indra/newview/llwearableitemslist.cpp
index c35b45d446..ba1d0b727d 100644
--- a/indra/newview/llwearableitemslist.cpp
+++ b/indra/newview/llwearableitemslist.cpp
@@ -88,6 +88,8 @@ 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;
}
//////////////////////////////////////////////////////////////////////////
@@ -168,7 +170,7 @@ BOOL LLPanelClothingListItem::postBuild()
addWidgetToRightSide("btn_move_up");
addWidgetToRightSide("btn_move_down");
addWidgetToRightSide("btn_lock");
- addWidgetToRightSide("btn_edit");
+ addWidgetToRightSide("btn_edit_panel");
setWidgetsVisible(false);
reshapeWidgets();
@@ -211,7 +213,7 @@ BOOL LLPanelBodyPartsListItem::postBuild()
LLPanelInventoryListItemBase::postBuild();
addWidgetToRightSide("btn_lock");
- addWidgetToRightSide("btn_edit");
+ addWidgetToRightSide("btn_edit_panel");
return TRUE;
}