diff options
| author | callum <none@none> | 2010-06-10 16:58:02 -0700 |
|---|---|---|
| committer | callum <none@none> | 2010-06-10 16:58:02 -0700 |
| commit | fc6d238884f06951a413004b46569304a9d9280a (patch) | |
| tree | 106a4f3e8a3b011d34a97b215070d5cd0a96c069 /indra/newview/llinventoryitemslist.cpp | |
| parent | 63577b8fe3f2b46da70e373364028ae45faf4e06 (diff) | |
| parent | 1065cce5e9db1bd18c2b485024ad360e48cedee2 (diff) | |
Default merge
Diffstat (limited to 'indra/newview/llinventoryitemslist.cpp')
| -rw-r--r-- | indra/newview/llinventoryitemslist.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llinventoryitemslist.cpp b/indra/newview/llinventoryitemslist.cpp index cd0e976a79..3e5f8d9848 100644 --- a/indra/newview/llinventoryitemslist.cpp +++ b/indra/newview/llinventoryitemslist.cpp @@ -132,8 +132,7 @@ BOOL LLPanelInventoryListItemBase::postBuild() setIconCtrl(getChild<LLIconCtrl>("item_icon")); setTitleCtrl(getChild<LLTextBox>("item_name")); - BOOL show_links = mForceNoLinksOnIcons ? FALSE : mItem->getIsLinkType(); - mIconImage = LLInventoryIcon::getIcon(mItem->getType(), mItem->getInventoryType(), show_links, mItem->getFlags(), FALSE); + mIconImage = LLInventoryIcon::getIcon(mItem->getType(), mItem->getInventoryType(), mItem->getFlags(), FALSE); setNeedsRefresh(true); @@ -199,7 +198,6 @@ LLPanelInventoryListItemBase::LLPanelInventoryListItemBase(LLViewerInventoryItem , mLeftWidgetsWidth(0) , mRightWidgetsWidth(0) , mNeedsRefresh(false) -, mForceNoLinksOnIcons(false) { } |