diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-29 16:15:33 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-29 16:15:33 +0300 |
| commit | 41fbbefd9730faa468e91ddcc09abd94ba4a8218 (patch) | |
| tree | 9fc8d1b55c71f8621b8ca31e335a69672ae044c9 /indra/newview/llinventorylistitem.cpp | |
| parent | 90353be438268c71300a5dfaac0a5fb79c71551c (diff) | |
| parent | 27e07e819d54eb2b571e308e083886fbe2771816 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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()); } |