livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Leslie Linden 2012-01-11 16:49:32 -08:00
parent 98f071aa6f
commit 59950f6178
5 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloateroutbox.cpp
View File

@ -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
{

12
indra/newview/llmarketplacefunctions.cpp
View File

@ -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;
}

2
indra/newview/llmarketplacefunctions.h
View File

@ -37,7 +37,7 @@
#include "llstring.h"
LLStringUtil::format_map_t getMarketplaceStringSubstitutions();
LLSD getMarketplaceStringSubstitutions();
namespace MarketplaceErrorCodes

3
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -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"/>

1
indra/newview/skins/default/xui/en/strings.xml
View File

@ -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>