DD-17 : WIP : Add live status to active listing folders, clean up getLabelSuffix() code a bit

3 files changed, 20 insertions, 6 deletions

diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp
index 2ed4605e0c..d9bc3a1ce0 100755
--- a/indra/newview/llfloateroutbox.cpp
+++ b/indra/newview/llfloateroutbox.cpp
@@ -743,12 +743,15 @@ void LLFloaterMarketplaceListings::onOpen(const LLSD& key)
         for (LLInventoryModel::cat_array_t::iterator iter = cats->begin(); iter != cats->end(); iter++, index++)
         {
             LLViewerInventoryCategory* category = *iter;
-            LLMarketplaceData::instance().addTestItem(category->getUUID());
-            if (index%2)
+            if (index%3)
             {
-                LLMarketplaceData::instance().setListingID(category->getUUID(),"TestingID1234");
+                LLMarketplaceData::instance().addTestItem(category->getUUID());
+                if (index%3 == 1)
+                {
+                    LLMarketplaceData::instance().setListingID(category->getUUID(),"TestingID1234");
+                }
+                LLMarketplaceData::instance().setActivation(category->getUUID(),(index%2));
             }
-            LLMarketplaceData::instance().setActivation(category->getUUID(),(index%3 == 0));
         }
     }
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 9d9279ce90..38dcb24477 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1959,7 +1959,16 @@ std::string LLFolderBridge::getLabelSuffix() const
         if (LLMarketplaceData::instance().isListed(getUUID()))
         {
             llinfos << "Merov : in merchant folder and listed : id = " << getUUID() << llendl;
-            std::string suffix = " (" + LLMarketplaceData::instance().getListingID(getUUID()) + ")";
+            std::string suffix = LLMarketplaceData::instance().getListingID(getUUID());
+            if (suffix.empty())
+            {
+                suffix = LLTrans::getString("MarketplaceNoID");
+            }
+            suffix = " (" +  suffix + ")";
+            if (LLMarketplaceData::instance().getActivationState(getUUID()))
+            {
+                suffix += " (" +  LLTrans::getString("MarketplaceActive") + ")";
+            }
             return LLInvFVBridge::getLabelSuffix() + suffix;
         }
         else
@@ -1970,7 +1979,6 @@ std::string LLFolderBridge::getLabelSuffix() const
 	}
 	else
 	{
-        llinfos << "Merov : not in merchant folder : id = " << getUUID() << llendl;
 		return LLInvFVBridge::getLabelSuffix();
 	}
 }
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 387ad138d9..1d3c112495 100755
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2235,6 +2235,9 @@ The [[MARKETPLACE_CREATE_STORE_URL] Marketplace store] is returning errors.
 	<string name="Marketplace Error Unsellable Item">Error: This item can not be sold on the marketplace.</string>
 	<string name="Marketplace Error Internal Import">Error: There was a problem with this item.  Try again later.</string>
 
+	<string name="MarketplaceNoID">no Mkt ID</string>
+	<string name="MarketplaceActive">live</string>
+
 	<string name="Open landmarks">Open landmarks</string>
 
 	<!-- use value="" because they have preceding spaces -->