diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-03-13 16:45:52 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-03-13 16:45:52 -0700 |
| commit | 705d4182c8a84728e7f00cf48110c8f9720e4c29 (patch) | |
| tree | 1666346cc9031c54020f10db9d033d796680bcc8 /indra/newview/llinventorybridge.cpp | |
| parent | 9de02b0cd3ac05ce172e12dbc2d288a5deccba11 (diff) | |
DD-42 : Rename merchant items to marketplace listings to be consistent with spec
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index c2f6ce8fb1..9d9279ce90 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -959,9 +959,9 @@ BOOL LLInvFVBridge::isInboxFolder() const return gInventory.isObjectDescendentOf(mUUID, inbox_id); } -BOOL LLInvFVBridge::isMerchantItemsFolder() const +BOOL LLInvFVBridge::isMarketplaceListingsFolder() const { - const LLUUID folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MERCHANT_ITEMS, false); + const LLUUID folder_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false); if (folder_id.isNull()) { @@ -1954,7 +1954,7 @@ std::string LLFolderBridge::getLabelSuffix() const accessories = (parent_folder_id == gInventory.getLibraryRootFolderID()); } */ - if (isMerchantItemsFolder()) + if (isMarketplaceListingsFolder()) { if (LLMarketplaceData::instance().isListed(getUUID())) { |