DD : Clean up marketplace listings folder creation so we create it in only one place

3 files changed, 11 insertions, 12 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index 88abd9ff9d..1d8097a813 100755
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -588,10 +588,12 @@ void LLFloaterMarketplaceValidation::onOpen(const LLSD& key)
     mEditor->setValue(LLSD());
 
     // Validates the marketplace
-	LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true);
-	llassert(marketplacelistings_id.notNull());
-    LLViewerInventoryCategory* cat = gInventory.getCategory(marketplacelistings_id);
-    validate_marketplacelistings(cat,boost::bind(&LLFloaterMarketplaceValidation::appendMessage, this, _1));
+	LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, false);
+    if (marketplacelistings_id.notNull())
+    {
+        LLViewerInventoryCategory* cat = gInventory.getCategory(marketplacelistings_id);
+        validate_marketplacelistings(cat,boost::bind(&LLFloaterMarketplaceValidation::appendMessage, this, _1));
+    }
 }
 
 // static
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index cd5da96e24..84cf62f910 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -319,11 +319,9 @@ BOOL LLInvFVBridge::copyToClipboard() const
 	return FALSE;
 }
 
-// *TODO: make sure this does the right thing
 void LLInvFVBridge::showProperties()
 {
-	LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true);
-	if (gInventory.isObjectDescendentOf(mUUID, marketplacelistings_id))
+	if (isMarketplaceListingsFolder())
     {
         LLFloaterReg::showInstance("item_properties", LLSD().with("id",mUUID));
     }
@@ -331,11 +329,6 @@ void LLInvFVBridge::showProperties()
     {
         show_item_profile(mUUID);
     }
-
-	// Disable old properties floater; this is replaced by the sidepanel.
-	/*
-	  LLFloaterReg::showInstance("properties", mUUID);
-	*/
 }
 
 void LLInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch)
diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp
index 3b68c12d11..fe67683de5 100755
--- a/indra/newview/llmarketplacefunctions.cpp
+++ b/indra/newview/llmarketplacefunctions.cpp
@@ -1173,6 +1173,10 @@ std::string LLMarketplaceData::getSLMConnectURL(const std::string& route)
         {
             url = "https://marketplace.secondlife-staging.com/api/1/viewer/" + gAgentID.asString();
         }
+        else
+        {
+            llinfos << "Merov : DD cap = " << url << ", agent = " << gAgentID.asString() << llendl;
+        }
         url += route;
     }
 	return url;