diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-18 17:32:44 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2010-03-18 17:32:44 +0200 |
| commit | 00c4dabc2ba4052f66654c871f82f90e21500d9d (patch) | |
| tree | 8283cea682faade74806612df2e2881b0c6f9194 /indra/newview/llfloaterbuy.cpp | |
| parent | 40e7a65c698665a8b1db128412bce8332f888875 (diff) | |
Fixed major bug EXT-2707 - Coalesced objects do not show the proper icon in inventory.
Added new icon for multi-objects.
New icon is used in inventory, object inventory and buy floater.
New icon can not be used in Group Notices because server does not send enough info in GroupNoticesListReply.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterbuy.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuy.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbuy.cpp b/indra/newview/llfloaterbuy.cpp index fba557c656..589f570d96 100644 --- a/indra/newview/llfloaterbuy.cpp +++ b/indra/newview/llfloaterbuy.cpp @@ -246,7 +246,8 @@ void LLFloaterBuy::inventoryChanged(LLViewerObject* obj, // Compute icon for this item BOOL item_is_multi = FALSE; - if ( inv_item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED ) + if ( inv_item->getFlags() & LLInventoryItem::II_FLAGS_LANDMARK_VISITED + || inv_item->getFlags() & LLInventoryItem::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS) { item_is_multi = TRUE; } |