diff options
| author | Richard Nelson <none@none> | 2010-06-04 14:26:08 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-06-04 14:26:08 -0700 |
| commit | 1be76eccdfed4d02f7ff8e34a29528887dd8d26c (patch) | |
| tree | 0f1ef59f9ff5986dbd6ce8ab117c66f92b4205bc /indra/newview/llinventoryitemslist.cpp | |
| parent | 46e1253ee11cd2aca41314ec4e9c053bddd7a0b4 (diff) | |
| parent | 05d7addde73511d303f9203d0dc007ebb2e5b299 (diff) | |
merge
Diffstat (limited to 'indra/newview/llinventoryitemslist.cpp')
| -rw-r--r-- | indra/newview/llinventoryitemslist.cpp | 4 |
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) { } |