diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llmarketplacefunctions.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/llmarketplacefunctions.h | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 1 |
5 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 130c26acdc..597602d5ab 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -332,7 +332,7 @@ void LLFloaterOutbox::updateView() std::string outbox_title; std::string outbox_tooltip; - LLStringUtil::format_map_t subs = getMarketplaceStringSubstitutions(); + const LLSD& subs = getMarketplaceStringSubstitutions(); if (mOutboxId.notNull()) { @@ -428,7 +428,9 @@ void LLFloaterOutbox::importReportResults(U32 status, const LLSD& content) } else if (status == MarketplaceErrorCodes::IMPORT_DONE_WITH_ERRORS) { - LLNotificationsUtil::add("OutboxImportHadErrors"); + const LLSD& subs = getMarketplaceStringSubstitutions(); + + LLNotificationsUtil::add("OutboxImportHadErrors", subs); } else { 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; } diff --git a/indra/newview/llmarketplacefunctions.h b/indra/newview/llmarketplacefunctions.h index 78df86ef3e..4731566366 100644 --- a/indra/newview/llmarketplacefunctions.h +++ b/indra/newview/llmarketplacefunctions.h @@ -37,7 +37,7 @@ #include "llstring.h" -LLStringUtil::format_map_t getMarketplaceStringSubstitutions(); +LLSD getMarketplaceStringSubstitutions(); namespace MarketplaceErrorCodes diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 61346bf3d6..657d9fe91a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -232,7 +232,8 @@ Some folders did not transfer Errors occurred when some folders were sent to the Marketplace. Those folders are still in your Merchant Outbox. -See the error log for more information. +See the [[MARKETPLACE_IMPORTS_URL] error log] for more information. + <usetemplate name="okbutton" yestext="OK"/> diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index a78f3df5b6..84fce6630b 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2040,6 +2040,7 @@ Returns a string with the requested data about the region <string name="MarketplaceURL">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/</string> <string name="MarketplaceURL_CreateStore">http://community.secondlife.com/t5/English-Knowledge-Base/Selling-in-the-Marketplace/ta-p/700193#Section_.4</string> <string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string> + <string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string> <string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string> <string name="InventoryOutboxNotMerchantTitle">Anyone can sell items on the Marketplace.</string> <string name="InventoryOutboxNotMerchantTooltip"></string> |