diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2012-10-25 16:13:39 -0700 |
| commit | 0cdff2817bdc342e0ac8b3c8711e3f7a72f1f617 (patch) | |
| tree | 0fbaca9292450f05588336eb6639b12d182156e1 /indra/newview/llfloaterbuycontents.cpp | |
| parent | 03fa24f8aecc071bac920a400c122cbce0b029b4 (diff) | |
| parent | 1743e6a81330824021667000f8acdd6cf64dbf1b (diff) | |
Merge
Diffstat (limited to 'indra/newview/llfloaterbuycontents.cpp')
| -rw-r--r-- | indra/newview/llfloaterbuycontents.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterbuycontents.cpp b/indra/newview/llfloaterbuycontents.cpp index 809d344d01..bca4b5e447 100644 --- a/indra/newview/llfloaterbuycontents.cpp +++ b/indra/newview/llfloaterbuycontents.cpp @@ -211,8 +211,8 @@ void LLFloaterBuyContents::inventoryChanged(LLViewerObject* obj, BOOL item_is_multi = FALSE; 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)) + || inv_item->getFlags() & LLInventoryItemFlags::II_FLAGS_OBJECT_HAS_MULTIPLE_ITEMS) + && !(inv_item->getFlags() & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK)) { item_is_multi = TRUE; } |