summaryrefslogtreecommitdiff
path: root/indra/newview/llmarketplacefunctions.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2012-01-11 16:49:32 -0800
committerLeslie Linden <leslie@lindenlab.com>2012-01-11 16:49:32 -0800
commit59950f6178699b96e86bfd2c0bc701271b3f1a6b (patch)
treea67fc2789382f0bc1521d72b1924139be4f71eea /indra/newview/llmarketplacefunctions.cpp
parent98f071aa6fc2961d9a86fa1d174c1f988a6ef8dc (diff)
EXP-1778 FIX -- Link to Marketplace Error log in transfer failed viewer notification
* Added a link to the "imports" log from the "done with errors" notification when sending folders to the marketplace.
Diffstat (limited to 'indra/newview/llmarketplacefunctions.cpp')
-rw-r--r--indra/newview/llmarketplacefunctions.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 84cbe3cac2..ee7505c4f4 100644
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -72,23 +72,21 @@ static std::string getMarketplaceURL(const std::string& urlStringName)
return marketplace_url;
}
-LLStringUtil::format_map_t getMarketplaceStringSubstitutions()
+LLSD getMarketplaceStringSubstitutions()
{
std::string marketplace_url = getMarketplaceURL("MarketplaceURL");
std::string marketplace_url_create = getMarketplaceURL("MarketplaceURL_CreateStore");
std::string marketplace_url_dashboard = getMarketplaceURL("MarketplaceURL_Dashboard");
+ std::string marketplace_url_imports = getMarketplaceURL("MarketplaceURL_Imports");
std::string marketplace_url_info = getMarketplaceURL("MarketplaceURL_LearnMore");
- LLStringUtil::format_map_t agent_map;
- agent_map["[AGENT_ID]"] = gAgent.getID().getString();
-
- LLStringUtil::format(marketplace_url_dashboard, agent_map);
-
- LLStringUtil::format_map_t marketplace_sub_map;
+ LLSD marketplace_sub_map;
+
marketplace_sub_map["[MARKETPLACE_URL]"] = marketplace_url;
marketplace_sub_map["[MARKETPLACE_CREATE_STORE_URL]"] = marketplace_url_create;
marketplace_sub_map["[MARKETPLACE_LEARN_MORE_URL]"] = marketplace_url_info;
marketplace_sub_map["[MARKETPLACE_DASHBOARD_URL]"] = marketplace_url_dashboard;
+ marketplace_sub_map["[MARKETPLACE_IMPORTS_URL]"] = marketplace_url_imports;
return marketplace_sub_map;
}