diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 09:25:39 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-29 09:25:39 +0100 |
| commit | 270a4198327c6dd43283e1d8fa99ea8905f8e8e6 (patch) | |
| tree | feb91c7280d0f611f89e02fe100549bc6a1324f8 /indra/newview/llinventorylistitem.cpp | |
| parent | e730c677499842d00dd0afd613ab14b83ed14552 (diff) | |
| parent | 3d14fe23fcf7f05cb207c34fdfb13c54c668eba1 (diff) | |
merge from viewer-release
Diffstat (limited to 'indra/newview/llinventorylistitem.cpp')
| -rw-r--r-- | indra/newview/llinventorylistitem.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorylistitem.cpp b/indra/newview/llinventorylistitem.cpp index b1f5b3be2f..b743ac3dcb 100644 --- a/indra/newview/llinventorylistitem.cpp +++ b/indra/newview/llinventorylistitem.cpp @@ -44,6 +44,7 @@ // newview #include "llinventorymodel.h" #include "llviewerinventory.h" +#include "llinventorydefines.h" static LLWidgetNameRegistry::StaticRegistrar sRegisterPanelInventoryListItemBaseParams(&typeid(LLPanelInventoryListItemBase::Params), "inventory_list_item"); @@ -166,7 +167,7 @@ BOOL LLPanelInventoryListItemBase::postBuild() LLViewerInventoryItem* inv_item = getItem(); if (inv_item) { - mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), FALSE); + mIconImage = LLInventoryIcon::getIcon(inv_item->getType(), inv_item->getInventoryType(), inv_item->getFlags(), LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS & inv_item->getFlags()); updateItem(inv_item->getName()); } |