summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorPaul ProductEngine <pguslisty@productengine.com>2012-05-04 20:18:12 +0300
committerPaul ProductEngine <pguslisty@productengine.com>2012-05-04 20:18:12 +0300
commitfe2e27ffc9031c2af02176e3b2d90edc7cb04ad4 (patch)
tree0f184174f85bd5339f6cd8063618d36a2a76edf4 /indra/newview
parentbc4d0b0b0f0cf8ee305598d66c78f4a5a723a955 (diff)
MAINT-462 FIXED ([PUBLIC]Buy Contents Window Misrepresenting Actual Contents)
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..809d344d01 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;
}