SL-18629 Marketplace folder creation loop avoidance

Probably shouldn't happen since we do not allow logins without caps, but
to be sure added validation.

1 files changed, 14 insertions, 3 deletions

diff --git a/indra/newview/llfloatermarketplacelistings.cpp b/indra/newview/llfloatermarketplacelistings.cpp
index c09e9f523d..71b3b16809 100644
--- a/indra/newview/llfloatermarketplacelistings.cpp
+++ b/indra/newview/llfloatermarketplacelistings.cpp
@@ -481,11 +481,22 @@ void LLFloaterMarketplaceListings::setRootFolder()
                 LLStringUtil::null,
                 [](const LLUUID &new_cat_id)
             {
-                LLFloaterMarketplaceListings *marketplace = LLFloaterReg::findTypedInstance<LLFloaterMarketplaceListings>("marketplace_listings");
+                LLFloaterMarketplaceListings* marketplace = LLFloaterReg::findTypedInstance<LLFloaterMarketplaceListings>("marketplace_listings");
                 if (marketplace)
                 {
-                    // will call setRootFolder again
-                    marketplace->updateView();
+                    if (new_cat_id.notNull())
+                    {
+                        // will call setRootFolder again
+                        marketplace->updateView();
+                    }
+                    // don't update in case of failure, createNewCategory can return
+                    // immediately if cap is missing and will cause a loop
+                    else
+                    {
+                        // unblock
+                        marketplace->mRootFolderCreating = false;
+                        LL_WARNS("SLM") << "Inventory warning: Failed to create marketplace listings folder for a merchant" << LL_ENDL;
+                    }
                 }
             }
             );