summaryrefslogtreecommitdiff
path: root/indra/newview/llwearableitemslist.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-06-04 11:16:32 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-06-04 11:16:32 +0100
commit23a5f47f4ae39a4e83e8ea3b4858ebc782a0675b (patch)
tree0a86eeccb9d130ccac6cb63169300ad2b5ba601b /indra/newview/llwearableitemslist.cpp
parent3906a4eb1db34cfc7e2b4919118ce9bbec3bbfc8 (diff)
parentbe7554c3b624427ccf8543fb0a3187a2d9f7090b (diff)
merge from viewer-public
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;
}