diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-12-29 13:56:03 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-12-29 13:56:03 -0800 |
| commit | 8de34ade3d40a4a174c135609284a52b342b0624 (patch) | |
| tree | 133c0fb682cb48a4ccefb35bd62eda7f7ac89361 | |
| parent | edbd73b8364f66bfce24701db5cb160ecc89e37d (diff) | |
DD-298 : Do not show beta notice in Merchant Outbox panel on error
| -rwxr-xr-x | indra/newview/llfloatermarketplacelistings.cpp | 2 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/strings.xml | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp index 00fd87fece..eb60d706e4 100755 --- a/indra/newview/llfloatermarketplacelistings.cpp +++ b/indra/newview/llfloatermarketplacelistings.cpp @@ -502,7 +502,7 @@ void LLFloaterMarketplaceListings::updateView() else { // "Errors!" message strings - text = LLTrans::getString("InventoryOutboxError", subs); + text = LLTrans::getString("InventoryMarketplaceError", subs); title = LLTrans::getString("InventoryOutboxErrorTitle"); tooltip = LLTrans::getString("InventoryOutboxErrorTooltip"); } diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 0b4bbf0105..6e4ab3067c 100755 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2287,6 +2287,9 @@ We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace <string name="InventoryOutboxErrorTitle">Marketplace Errors.</string> <string name="InventoryOutboxErrorTooltip"></string> <string name="InventoryOutboxError"> +The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors. + </string> + <string name="InventoryMarketplaceError"> This feature is currently in Beta. Please add your name to this [http://goo.gl/forms/FCQ7UXkakz Google form] if you would like to participate. </string> <string name="InventoryMarketplaceListingsNoItemsTitle">Your Marketplace Listings folder is empty.</string> |