diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-03 17:03:22 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-08-03 17:03:22 +0300 |
| commit | 497a151fb923675cc6fae139bcdde1678be195bd (patch) | |
| tree | d50aaa0aa62da430d51d8497c0b02e2480fa2581 /indra/newview/llinventorylistitem.cpp | |
| parent | 48ccc7ccfbe3e94f9dd78ced588e0a76d03fe070 (diff) | |
| parent | f9f3c5eeb2362e388c1d857626d276bbbd40edcf (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llinventorylistitem.cpp')
| -rw-r--r-- | indra/newview/llinventorylistitem.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index b743ac3dcb..ea57d36c06 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -44,7 +44,6 @@ // newview #include "llinventorymodel.h" #include "llviewerinventory.h" -#include "llinventorydefines.h" static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelInventoryListItemBaseParams(&typeid(LLPanelInventoryListItemBase::Params), "inventory_list_item"); @@ -97,12 +96,9 @@ void LLPanelInventoryListItemBase::draw() if (mSeparatorVisible && mSeparatorImage) { - // place under bottom of listitem, using image height - // item_pad in list using the item should be >= image height - // to avoid cropping of top of the next item. + // stretch along bottom of listitem, using image height LLRect separator_rect = getLocalRect(); - separator_rect.mTop = separator_rect.mBottom; - separator_rect.mBottom -= mSeparatorImage->getHeight(); + separator_rect.mTop = mSeparatorImage->getHeight(); mSeparatorImage->draw(separator_rect); } @@ -167,7 +163,7 @@ BOOL LLPanelInventoryListItemBase::postBuild() LLViewerInventoryItem* inv_item = getItem(); if (inv_item) { - mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & inv_item->getFlags()); + mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), FALSE); updateItem(inv_item->getName()); } |