summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorpaulgproductengine <none@none>2012-02-14 20:08:10 +0200
committerpaulgproductengine <none@none>2012-02-14 20:08:10 +0200
commit7bb8373d7cb746af8814e09373ed89c332e14619 (patch)
treeba29a900b87dc08e8956916ac0a69f1d8145830a /indra/newview
parent5c8bcc4643e8f2e02c96847e3eeeced0d2b4157a (diff)
EXP-1546 FIXED (received items - purchasing some bodyparts and clothing from a prim marked for sale show wrong inventory icons)
- In buy floater, for multiple WEARABLES inventory items show corresponding wearable icons
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llfloaterbuycontents.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp
index a7388d21a3..bca4b5e447 100644
--- a/indra/newview/llfloaterbuycontents.cpp
+++ b/indra/newview/llfloaterbuycontents.cpp
@@ -210,7 +210,9 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj,
LLSD row;
BOOL item_is_multi = FALSE;
- if ( inv_item->getFlags() & LLInventoryItemFlags::II_FLAGS_LANDMARK_VISITED )
+ if ((inv_item->getFlags() & LLInventoryItemFlags::II_FLAGS_LANDMARK_VISITED
+ || inv_item->getFlags() & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS)
+ && !(inv_item->getFlags() & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK))
{
item_is_multi = TRUE;
}