diff options
| author | Andrew Dyukov <adyukov@productengine.com> | 2010-07-28 12:33:34 +0300 |
|---|---|---|
| committer | Andrew Dyukov <adyukov@productengine.com> | 2010-07-28 12:33:34 +0300 |
| commit | 5be77f8e8cdec5fa1bd16568875dc6c9ac94d96e (patch) | |
| tree | 549f2f43fda888dab003a1dba8469e83a6ea5c6f | |
| parent | 6110cb6a36cb9cef39af0951ec47458696ac1da6 (diff) | |
EXT-2707 ADDITIONAL FIX Fixed wrong icon showing for coalesced objects in "Add More" panel.
Problem was caused by getting item's icon always with FALSE value of item_is_multi argument in LLPanelInventoryListItemBase::postBuild().
- Used II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS flag to determine whether item is multiobject and getting appropriate icon.
Reviewed by Neal Orman at https://codereview.productengine.com/secondlife/r/812/
--HG--
branch : product-engine
| -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 2546390fcb..c2ee5c8c8b 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()); } |