diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-02-15 14:02:33 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-02-15 14:02:33 -0800 |
| commit | 6a8e22cf022bfc44335d6d8e6f83315d84b24c8c (patch) | |
| tree | 55ead3a2f73bca404577c421a671c410046caab0 /indra | |
| parent | df54caf6f93b164eef1a0a64cc173be67d762041 (diff) | |
MAINT-2301 : Change messaging in the Merchant Outbox panel when an error happened, so not to be confused with the not-a-merchant case.
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 5 |
2 files changed, 18 insertions, 2 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 2545fcbc36..d66b433834 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -350,25 +350,36 @@ void LLFloaterOutbox::updateView() std::string outbox_tooltip; const LLSD& subs = getMarketplaceStringSubstitutions(); + U32 mkt_status = LLMarketplaceInventoryImporter::getInstance()->getMarketPlaceStatus(); if (mOutboxId.notNull()) { + // "Outbox is empty!" message strings outbox_text = LLTrans::getString("InventoryOutboxNoItems", subs); outbox_title = LLTrans::getString("InventoryOutboxNoItemsTitle"); outbox_tooltip = LLTrans::getString("InventoryOutboxNoItemsTooltip"); } - else if (LLMarketplaceInventoryImporter::getInstance()->getMarketPlaceStatus() <= MarketplaceStatusCodes::MARKET_PLACE_INITIALIZING) + else if (mkt_status <= MarketplaceStatusCodes::MARKET_PLACE_INITIALIZING) { + // "Initializing!" message strings outbox_text = LLTrans::getString("InventoryOutboxInitializing", subs); outbox_title = LLTrans::getString("InventoryOutboxInitializingTitle"); outbox_tooltip = LLTrans::getString("InventoryOutboxInitializingTooltip"); } - else + else if (mkt_status == MarketplaceStatusCodes::MARKET_PLACE_NOT_MERCHANT) { + // "Not a merchant!" message strings outbox_text = LLTrans::getString("InventoryOutboxNotMerchant", subs); outbox_title = LLTrans::getString("InventoryOutboxNotMerchantTitle"); outbox_tooltip = LLTrans::getString("InventoryOutboxNotMerchantTooltip"); } + else + { + // "Errors!" message strings + outbox_text = LLTrans::getString("InventoryOutboxError", subs); + outbox_title = LLTrans::getString("InventoryOutboxErrorTitle"); + outbox_tooltip = LLTrans::getString("InventoryOutboxErrorTooltip"); + } mInventoryText->setValue(outbox_text); mInventoryTitle->setValue(outbox_title); diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index c375e4906c..5be1285242 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2195,6 +2195,11 @@ Drag folders to this area and click "Send to Marketplace" to list them for sale <string name="InventoryOutboxInitializing"> We are accessing your account on the [[MARKETPLACE_CREATE_STORE_URL] Marketplace store]. </string> + <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="Marketplace Error None">No errors</string> <string name="Marketplace Error Not Merchant">Error: Before sending items to the Marketplace you will need to set yourself up as a merchant (free of charge).</string> |