summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-04 09:52:48 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-04 09:52:48 +0100
commitbe7554c3b624427ccf8543fb0a3187a2d9f7090b (patch)
treee8db1121d0b7fc981b9642b7591ebb0dcdff5efe /indra/newview/llwearableitemslist.cpp
parenta9164676687341fae33d3fe5f22b05156a65ff85 (diff)
parentf41d06012b53c7fe65ec1347364a2228b2992dc7 (diff)
merge from PE's viewer-trunk
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;
}