summaryrefslogtreecommitdiff
path: root/indra/newview/llinventoryitemslist.cpp
diff options
context:
space:
mode:
authorAndrew Dyukov <adyukov@productengine.com>2010-06-03 16:21:56 +0300
committerAndrew Dyukov <adyukov@productengine.com>2010-06-03 16:21:56 +0300
commit7902899df5f22794d5ccd2d977d2cb1361021d5e (patch)
treeddf20d03e024982146d02e07eec6f81adb86037c /indra/newview/llinventoryitemslist.cpp
parent7e0c07b6a64a2e1816cbfe6436215c309af58452 (diff)
EXT-7511 FIXED Fixed problems in appearance UI
- Made slight changes in xml according to requirements. - Added mForceNoLinksOnIcons bool member to LLPanelInventoryListItemBase. It is used in LLPanelWearableListItem to disable showing of link icons as was requested in ticket. - Created icon for divider 3 pixels high as asked by Erica in EXT-7233. To properly show and hide it made changes to LLCOFWearables::buildClothingListItem which now not only showes separator but also reshapes panel depending on its visibility. Increased heights of body parts, dummy clothing and attachment items because dividers are now 2 pxls higher and they always have dividers. Changed heights of buttons accordingly. Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/502/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llinventoryitemslist.cpp')
-rw-r--r--indra/newview/llinventoryitemslist.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp
index 750cdfb678..cd0e976a79 100644
--- a/indra/newview/llinventoryitemslist.cpp
+++ b/indra/newview/llinventoryitemslist.cpp
@@ -132,7 +132,8 @@ BOOL LLPanelInventoryListItemBase::postBuild()
setIconCtrl(getChild<LLIconCtrl>("item_icon"));
setTitleCtrl(getChild<LLTextBox>("item_name"));
- mIconImage = LLInventoryIcon::getIcon(mItem->getType(), mItem->getInventoryType(), mItem->getIsLinkType(), mItem->getFlags(), FALSE);
+ BOOL show_links = mForceNoLinksOnIcons ? FALSE : mItem->getIsLinkType();
+ mIconImage = LLInventoryIcon::getIcon(mItem->getType(), mItem->getInventoryType(), show_links, mItem->getFlags(), FALSE);
setNeedsRefresh(true);
@@ -198,6 +199,7 @@ LLPanelInventoryListItemBase::LLPanelInventoryListItemBase(LLViewerInventoryItem
, mLeftWidgetsWidth(0)
, mRightWidgetsWidth(0)
, mNeedsRefresh(false)
+, mForceNoLinksOnIcons(false)
{
}