diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-06-04 10:27:46 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-06-04 10:27:46 -0400 |
commit | a77d273e3ab448d84507bfdb763df8335eadea9e (patch) | |
tree | 938e3b9b25ef1dd675d0acd2cf322f059b048d8b /indra/newview/llinventoryitemslist.cpp | |
parent | 882d8952dad1de21a3b2fca76e5f418b4c1b440f (diff) | |
parent | 15b855409a0ae7588236fe43f4aaa1d5d389b005 (diff) |
automated 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) { } |