From 705d4182c8a84728e7f00cf48110c8f9720e4c29 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Thu, 13 Mar 2014 16:45:52 -0700
Subject: DD-42 : Rename merchant items to marketplace listings to be
 consistent with spec

---
 indra/newview/llinventorybridge.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview/llinventorybridge.cpp')

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()))
         {
-- 
cgit v1.2.3