From ae2f24d0c10a9a91090aa040f8367e8691fcbbd1 Mon Sep 17 00:00:00 2001
From: Merov Linden <merov@lindenlab.com>
Date: Tue, 10 Jun 2014 14:04:53 -0700
Subject: DD : Clean up marketplace listings folder creation so we create it in
 only one place

---
 indra/newview/llinventorybridge.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'indra/newview/llinventorybridge.cpp')

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)
-- 
cgit v1.3