DD-102 : Fix crash when emptying trash containing nested folders. Also avoid getting listings several times

1 files changed, 4 insertions, 15 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index b1b397c77c..277bd5aaed 100755
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -242,25 +242,15 @@ void LLFloaterMarketplaceListings::onOpen(const LLSD& key)
 	{
 		initializeMarketPlace();
 	}
-	else
-	{
-		setup();
+    else
+    {
+        updateView();
 	}
-	
-	//
-	// Update the floater view
-	//
-	updateView();
-	
-	//
-	// Trigger fetch of the contents
-	//
-	fetchContents();
 }
 
 void LLFloaterMarketplaceListings::onFocusReceived()
 {
-	fetchContents();
+	updateView();
 }
 
 void LLFloaterMarketplaceListings::fetchContents()
@@ -484,7 +474,6 @@ void LLFloaterMarketplaceListings::onChanged()
     LLViewerInventoryCategory* category = gInventory.getCategory(mRootFolderId);
 	if (mRootFolderId.notNull() && category)
     {
-        fetchContents();
         updateView();
     }
     else