From c52b4e27f2fbeb558eec3ea587fe88f8e5b947dd Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Fri, 18 Apr 2014 11:23:06 -0700
Subject: [PATCH] DD-11 : Suppress getListingName() method since we actually do
not need that to get a listing URL
---
indra/newview/llmarketplacefunctions.cpp | 19 +++----------------
indra/newview/llmarketplacefunctions.h | 1 -
2 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 4a6914ee9ce..9465401d882 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -624,18 +624,6 @@ std::string LLMarketplaceData::getListingID(const LLUUID& folder_id)
return (it == mMarketplaceItems.end() ? "" : (it->second).mListingId);
}
-std::string LLMarketplaceData::getListingName(const LLUUID& folder_id)
-{
- std::string listing_name = "";
- marketplace_items_list_t::iterator it = mMarketplaceItems.find(folder_id);
- if (it != mMarketplaceItems.end())
- {
- // *TODO : Call the MKT API to get the name of a listing
- llinfos << "Merov : Marketplace warning : No API to get Listing name for : " << folder_id << llendl;
- }
- return listing_name;
-}
-
LLUUID LLMarketplaceData::getVersionFolderID(const LLUUID& folder_id)
{
marketplace_items_list_t::iterator it = mMarketplaceItems.find(folder_id);
@@ -665,17 +653,16 @@ bool LLMarketplaceData::isVersionFolder(const LLUUID& folder_id)
std::string LLMarketplaceData::getListingURL(const LLUUID& folder_id)
{
// Get the listing id (i.e. go up the hierarchy to find the listing folder
- // URL format will be something like : https://marketplace.secondlife.com/p/<listing_name>/<listing_id>
+ // URL format will be something like : https://marketplace.secondlife.com/p/listing/<listing_id>
std::string marketplace_url = getMarketplaceURL("MarketplaceURL");
S32 depth = depth_nesting_in_marketplace(folder_id);
LLUUID listing_uuid = nested_parent_id(folder_id, depth);
- std::string listing_name = getListingName(listing_uuid);
std::string listing_id = getListingID(listing_uuid);
- if (!listing_name.empty() && !listing_id.empty())
+ if (!listing_id.empty())
{
- marketplace_url += "p/" + listing_name + "/" + listing_id;
+ marketplace_url += "p/listing/" + listing_id;
}
return marketplace_url;
}
diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h
index 2b90dd678fe..9485311b667 100755
--- a/indra/newview/llmarketplacefunctions.h
+++ b/indra/newview/llmarketplacefunctions.h
@@ -158,7 +158,6 @@ class LLMarketplaceData
// Access Marketplace data set : each method returns a default value if the folder_id can't be found
bool getActivationState(const LLUUID& folder_id);
std::string getListingID(const LLUUID& folder_id);
- std::string getListingName(const LLUUID& folder_id);
LLUUID getVersionFolderID(const LLUUID& folder_id);
std::string getListingURL(const LLUUID& folder_id);
--
GitLab