diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-18 20:06:32 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-03-18 20:06:32 +0200 |
| commit | 1944f64107be98f344824045a19e113966591340 (patch) | |
| tree | d6b199092d07abc44fdf57deeaf8a332f010610f /indra/newview/llfloaterbuy.cpp | |
| parent | 1bf989705cf33fa27e404743108c6920cf33a7f2 (diff) | |
| parent | c74f87015118a6da7036623d026fc512f46af9d5 (diff) | |
manual merge -r 10503
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; } |