diff options
author | Kent Quirk <q@lindenlab.com> | 2010-03-18 23:44:30 -0400 |
---|---|---|
committer | Kent Quirk <q@lindenlab.com> | 2010-03-18 23:44:30 -0400 |
commit | a072b63f4106b707ce0cea7826223433f5bba352 (patch) | |
tree | 4f1b3ad15b57a58508e0402c2f6cbeb31a4928f8 /indra/newview/llfloaterbuy.cpp | |
parent | 0c1ff8e8769a569c2551a2be04a18cc854cfc5d4 (diff) | |
parent | 1944f64107be98f344824045a19e113966591340 (diff) |
Merge of PE merge with extra head
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; } |