Merge branch 'develop' into marchcat/b-develop

# Conflicts:
#	indra/newview/llfeaturemanager.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvoicewebrtc.cpp

1 files changed, 180 insertions, 162 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index ca84c30b66..896c7d8d70 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1897,20 +1897,24 @@ void LLItemBridge::selectItem()
     }
 }
 
+// virtual
 void LLItemBridge::restoreItem()
 {
-    LLViewerInventoryItem* item = static_cast<LLViewerInventoryItem*>(getItem());
-    if(item)
+    if (LLViewerInventoryItem* item = getItem())
     {
-        LLInventoryModel* model = getInventoryModel();
-        bool is_snapshot = (item->getInventoryType() == LLInventoryType::IT_SNAPSHOT);
+        bool is_snapshot = item->getInventoryType() == LLInventoryType::IT_SNAPSHOT;
+        LLFolderType::EType preferred_type = is_snapshot ?
+            LLFolderType::FT_SNAPSHOT_CATEGORY :
+            LLFolderType::assetTypeToFolderType(item->getType());
 
-        const LLUUID new_parent = model->findCategoryUUIDForType(is_snapshot? LLFolderType::FT_SNAPSHOT_CATEGORY : LLFolderType::assetTypeToFolderType(item->getType()));
-        // do not restamp on restore.
+        LLInventoryModel* model = getInventoryModel();
+        LLUUID new_parent = model->findCategoryUUIDForType(preferred_type);
+        // Do not restamp on restore.
         LLInvFVBridge::changeItemParent(model, item, new_parent, false);
     }
 }
 
+// virtual
 void LLItemBridge::restoreToWorld()
 {
     //Similar functionality to the drag and drop rez logic
@@ -1931,26 +1935,27 @@ void LLItemBridge::restoreToWorld()
 
         //remove local inventory copy, sim will deal with permissions and removing the item
         //from the actual inventory if its a no-copy etc
-        if(!itemp->getPermissions().allowCopyBy(gAgent.getID()))
+        if (!itemp->getPermissions().allowCopyBy(gAgent.getID()))
         {
             remove_from_inventory = true;
         }
 
         // Check if it's in the trash. (again similar to the normal rez logic)
         const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH);
-        if(gInventory.isObjectDescendentOf(itemp->getUUID(), trash_id))
+        if (gInventory.isObjectDescendentOf(itemp->getUUID(), trash_id))
         {
             remove_from_inventory = true;
         }
     }
 
-    if(remove_from_inventory)
+    if (remove_from_inventory)
     {
         gInventory.deleteObject(itemp->getUUID());
         gInventory.notifyObservers();
     }
 }
 
+// virtual
 void LLItemBridge::gotoItem()
 {
     LLInventoryObject *obj = getInventoryObject();
@@ -1960,39 +1965,43 @@ void LLItemBridge::gotoItem()
     }
 }
 
+// virtual
 LLUIImagePtr LLItemBridge::getIcon() const
 {
-    LLInventoryObject *obj = getInventoryObject();
-    if (obj)
+    if (LLInventoryObject* obj = getInventoryObject())
     {
-        return LLInventoryIcon::getIcon(obj->getType(),
-                                        LLInventoryType::IT_NONE,
-                                        mIsLink);
+        return LLInventoryIcon::getIcon(obj->getType(), LLInventoryType::IT_NONE, mIsLink);
     }
 
     return LLInventoryIcon::getIcon(LLInventoryType::ICONNAME_OBJECT);
 }
 
+// virtual
 LLUIImagePtr LLItemBridge::getIconOverlay() const
 {
     if (getItem() && getItem()->getIsLinkType())
     {
         return LLUI::getUIImage("Inv_Link");
     }
+
     return NULL;
 }
 
+// virtual
 PermissionMask LLItemBridge::getPermissionMask() const
 {
-    LLViewerInventoryItem* item = getItem();
-    PermissionMask perm_mask = 0;
-    if (item) perm_mask = item->getPermissionMask();
-    return perm_mask;
+    if (LLViewerInventoryItem* item = getItem())
+    {
+        return item->getPermissionMask();
+    }
+
+    return 0;
 }
 
+// virtual
 void LLItemBridge::buildDisplayName() const
 {
-    if(getItem())
+    if (getItem())
     {
         mDisplayName.assign(getItem()->getName());
     }
@@ -2005,14 +2014,15 @@ void LLItemBridge::buildDisplayName() const
     mSearchableName.append(getLabelSuffix());
     LLStringUtil::toUpper(mSearchableName);
 
-    //Name set, so trigger a sort
+    // Name set, so trigger a sort
     LLInventorySort sorter = static_cast<LLFolderViewModelInventory&>(mRootViewModel).getSorter();
-    if(mParent && !sorter.isByDate())
+    if (mParent && !sorter.isByDate())
     {
         mParent->requestSort();
     }
 }
 
+// virtual
 LLFontGL::StyleFlags LLItemBridge::getLabelStyle() const
 {
     U8 font = LLFontGL::NORMAL;
@@ -2023,7 +2033,7 @@ LLFontGL::StyleFlags LLItemBridge::getLabelStyle() const
         // LL_INFOS() << "BOLD" << LL_ENDL;
         font |= LLFontGL::BOLD;
     }
-    else if(item && item->getIsLinkType())
+    else if (item && item->getIsLinkType())
     {
         font |= LLFontGL::ITALIC;
     }
@@ -2031,6 +2041,7 @@ LLFontGL::StyleFlags LLItemBridge::getLabelStyle() const
     return (LLFontGL::StyleFlags)font;
 }
 
+// virtual
 std::string LLItemBridge::getLabelSuffix() const
 {
     // String table is loaded before login screen and inventory items are
@@ -2040,19 +2051,19 @@ std::string LLItemBridge::getLabelSuffix() const
     static std::string NO_XFER = LLTrans::getString("no_transfer_lbl");
     static std::string LINK = LLTrans::getString("link");
     static std::string BROKEN_LINK = LLTrans::getString("broken_link");
+
     std::string suffix;
-    LLInventoryItem* item = getItem();
-    if(item)
+    if (LLInventoryItem* item = getItem())
     {
         // Any type can have the link suffix...
-        bool broken_link = LLAssetType::lookupIsLinkType(item->getType());
-        if (broken_link) return BROKEN_LINK;
+        if (LLAssetType::lookupIsLinkType(item->getType()))
+            return BROKEN_LINK;
 
-        bool link = item->getIsLinkType();
-        if (link) return LINK;
+        if (item->getIsLinkType())
+            return LINK;
 
         // ...but it's a bit confusing to put nocopy/nomod/etc suffixes on calling cards.
-        if(LLAssetType::AT_CALLINGCARD != item->getType()
+        if (LLAssetType::AT_CALLINGCARD != item->getType()
            && item->getPermissions().getOwner() == gAgent.getID())
         {
             bool copy = item->getPermissions().allowCopyBy(gAgent.getID());
@@ -2067,8 +2078,7 @@ std::string LLItemBridge::getLabelSuffix() const
                 suffix += suffix.empty() ? " " : ",";
                 suffix += NO_MOD;
             }
-            bool xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER,
-                                                                gAgent.getID());
+            bool xfer = item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID());
             if (!xfer)
             {
                 suffix += suffix.empty() ? " " : ",";
@@ -2076,24 +2086,25 @@ std::string LLItemBridge::getLabelSuffix() const
             }
         }
     }
+
     return suffix;
 }
 
+// virtual
 time_t LLItemBridge::getCreationDate() const
 {
-    LLViewerInventoryItem* item = getItem();
-    if (item)
+    if (LLViewerInventoryItem* item = getItem())
     {
         return item->getCreationDate();
     }
+
     return 0;
 }
 
-
+// virtual
 bool LLItemBridge::isItemRenameable() const
 {
-    LLViewerInventoryItem* item = getItem();
-    if(item)
+    if (LLViewerInventoryItem* item = getItem())
     {
         // (For now) Don't allow calling card rename since that may confuse users as to
         // what the calling card points to.
@@ -2112,50 +2123,62 @@ bool LLItemBridge::isItemRenameable() const
             return false;
         }
 
-        return (item->getPermissions().allowModifyBy(gAgent.getID()));
+        return item->getPermissions().allowModifyBy(gAgent.getID());
     }
+
     return false;
 }
 
+// virtual
 bool LLItemBridge::renameItem(const std::string& new_name)
 {
-    if(!isItemRenameable())
+    if (!isItemRenameable())
         return false;
+
     LLPreview::dirty(mUUID);
     LLInventoryModel* model = getInventoryModel();
-    if(!model)
+    if (!model)
         return false;
+
     LLViewerInventoryItem* item = getItem();
-    if(item && (item->getName() != new_name))
+    if (item && (item->getName() != new_name))
     {
         LLSD updates;
         updates["name"] = new_name;
         update_inventory_item(item->getUUID(),updates, NULL);
     }
-    // return false because we either notified observers (& therefore
-    // rebuilt) or we didn't update.
+
+    // return false because we either notified observers
+    // (& therefore rebuilt) or we didn't update.
     return false;
 }
 
+// virtual
 bool LLItemBridge::removeItem()
 {
-    if(!isItemRemovable())
+    if (!isItemRemovable())
     {
         return false;
     }
 
     // move it to the trash
     LLInventoryModel* model = getInventoryModel();
-    if(!model) return false;
+    if (!model)
+        return false;
+
     const LLUUID& trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
     LLViewerInventoryItem* item = getItem();
-    if (!item) return false;
+    if (!item)
+        return false;
+
     if (item->getType() != LLAssetType::AT_LSL_TEXT)
     {
         LLPreview::hide(mUUID, true);
     }
+
     // Already in trash
-    if (model->isObjectDescendentOf(mUUID, trash_id)) return false;
+    if (model->isObjectDescendentOf(mUUID, trash_id))
+        return false;
 
     LLNotification::Params params("ConfirmItemDeleteHasLinks");
     params.functor.function(boost::bind(&LLItemBridge::confirmRemoveItem, this, _1, _2));
@@ -2187,26 +2210,31 @@ bool LLItemBridge::removeItem()
 bool LLItemBridge::confirmRemoveItem(const LLSD& notification, const LLSD& response)
 {
     S32 option = LLNotificationsUtil::getSelectedOption(notification, response);
-    if (option != 0) return false;
+    if (option != 0)
+        return false;
 
     LLInventoryModel* model = getInventoryModel();
-    if (!model) return false;
+    if (!model)
+        return false;
 
     LLViewerInventoryItem* item = getItem();
-    if (!item) return false;
+    if (!item)
+        return false;
 
     const LLUUID& trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH);
     // if item is not already in trash
-    if(item && !model->isObjectDescendentOf(mUUID, trash_id))
+    if (item && !model->isObjectDescendentOf(mUUID, trash_id))
     {
         // move to trash, and restamp
         LLInvFVBridge::changeItemParent(model, item, trash_id, true);
         // delete was successful
         return true;
     }
+
     return false;
 }
 
+// virtual
 bool LLItemBridge::isItemCopyable(bool can_copy_as_link) const
 {
     LLViewerInventoryItem* item = getItem();
@@ -2214,6 +2242,7 @@ bool LLItemBridge::isItemCopyable(bool can_copy_as_link) const
     {
         return false;
     }
+
     // Can't copy worn objects.
     // Worn objects are tied to their inworld conterparts
     // Copy of modified worn object will return object with obsolete asset and inventory
@@ -2230,37 +2259,36 @@ bool LLItemBridge::isItemCopyable(bool can_copy_as_link) const
 
 LLViewerInventoryItem* LLItemBridge::getItem() const
 {
-    LLViewerInventoryItem* item = NULL;
-    LLInventoryModel* model = getInventoryModel();
-    if(model)
+    if (LLInventoryModel* model = getInventoryModel())
     {
-        item = (LLViewerInventoryItem*)model->getItem(mUUID);
+        return model->getItem(mUUID);
     }
-    return item;
+
+    return NULL;
 }
 
+// virtual
 const LLUUID& LLItemBridge::getThumbnailUUID() const
 {
-    LLViewerInventoryItem* item = NULL;
-    LLInventoryModel* model = getInventoryModel();
-    if(model)
-    {
-        item = (LLViewerInventoryItem*)model->getItem(mUUID);
-    }
-    if (item)
+    if (LLInventoryModel* model = getInventoryModel())
     {
-        return item->getThumbnailUUID();
+        if (LLViewerInventoryItem* item = model->getItem(mUUID))
+        {
+            return item->getThumbnailUUID();
+        }
     }
+
     return LLUUID::null;
 }
 
+// virtual
 bool LLItemBridge::isItemPermissive() const
 {
-    LLViewerInventoryItem* item = getItem();
-    if(item)
+    if (LLViewerInventoryItem* item = getItem())
     {
         return item->getIsFullPerm();
     }
+
     return false;
 }
 
@@ -2583,16 +2611,22 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
 
     LLInventoryModel* model = getInventoryModel();
 
-    if (!inv_cat) return false; // shouldn't happen, but in case item is incorrectly parented in which case inv_cat will be NULL
-    if (!model) return false;
-    if (!isAgentAvatarValid()) return false;
-    if (!isAgentInventory()) return false; // cannot drag categories into library
+    if (!inv_cat) // shouldn't happen, but in case item is incorrectly parented in which case inv_cat will be NULL
+        return false;
+    if (!model)
+        return false;
+    if (!isAgentAvatarValid())
+        return false;
+    if (!isAgentInventory())
+        return false; // cannot drag categories into library
 
     LLInventoryPanel* destination_panel = mInventoryPanel.get();
-    if (!destination_panel) return false;
+    if (!destination_panel)
+        return false;
 
     LLInventoryFilter* filter = getInventoryFilter();
-    if (!filter) return false;
+    if (!filter)
+        return false;
 
     const LLUUID &cat_id = inv_cat->getUUID();
     const LLUUID &current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
@@ -2689,7 +2723,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
                 is_movable = false;
             }
         }
-        if(is_movable && move_is_into_current_outfit && is_link)
+        if (is_movable && move_is_into_current_outfit && is_link)
         {
             is_movable = false;
         }
@@ -2717,7 +2751,7 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
             for (S32 i=0; i < descendent_categories.size(); ++i)
             {
                 LLInventoryCategory* category = descendent_categories[i];
-                if(LLFolderType::lookupIsProtectedType(category->getPreferredType()))
+                if (LLFolderType::lookupIsProtectedType(category->getPreferredType()))
                 {
                     // Can't move "special folders" (e.g. Textures Folder).
                     is_movable = false;
@@ -2749,9 +2783,8 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
         }
         if (is_movable && move_is_into_trash)
         {
-            for (S32 i=0; i < descendent_items.size(); ++i)
+            for (LLViewerInventoryItem* item : descendent_items)
             {
-                LLInventoryItem* item = descendent_items[i];
                 if (get_is_item_worn(item->getUUID()))
                 {
                     is_movable = false;
@@ -2761,10 +2794,8 @@ bool LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat,
         }
         if (is_movable && move_is_into_landmarks)
         {
-            for (S32 i=0; i < descendent_items.size(); ++i)
+            for (LLViewerInventoryItem* item : descendent_items)
             {
-                LLViewerInventoryItem* item = descendent_items[i];
-
                 // Don't move anything except landmarks and categories into Landmarks folder.
                 // We use getType() instead of getActua;Type() to allow links to landmarks and folders.
                 if (LLAssetType::AT_LANDMARK != item->getType() && LLAssetType::AT_CATEGORY != item->getType())
@@ -3055,7 +3086,7 @@ bool move_inv_category_world_to_agent(const LLUUID& object_id,
     // permissions.
     // content category has same ID as object itself
     LLViewerObject* object = gObjectList.findObject(object_id);
-    if(!object)
+    if (!object)
     {
         LL_INFOS() << "Object not found for drop." << LL_ENDL;
         return false;
@@ -3083,11 +3114,9 @@ bool move_inv_category_world_to_agent(const LLUUID& object_id,
 
     // coming from a task. Need to figure out if the person can
     // move/copy this item.
-    LLInventoryObject::object_list_t::iterator it = inventory_objects.begin();
-    LLInventoryObject::object_list_t::iterator end = inventory_objects.end();
-    for ( ; it != end; ++it)
+    for (LLPointer<LLInventoryObject> obj : inventory_objects)
     {
-        LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(it->get());
+        LLInventoryItem* item = dynamic_cast<LLInventoryItem*>(obj.get());
         if (!item)
         {
             LL_WARNS() << "Invalid inventory item for drop" << LL_ENDL;
@@ -3097,13 +3126,13 @@ bool move_inv_category_world_to_agent(const LLUUID& object_id,
         // coming from a task. Need to figure out if the person can
         // move/copy this item.
         LLPermissions perm(item->getPermissions());
-        if((perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID())
+        if ((perm.allowCopyBy(gAgent.getID(), gAgent.getGroupID())
             && perm.allowTransferTo(gAgent.getID())))
 //          || gAgent.isGodlike())
         {
             accept = true;
         }
-        else if(object->permYouOwner())
+        else if (object->permYouOwner())
         {
             // If the object cannot be copied, but the object the
             // inventory is owned by the agent, then the item can be
@@ -3123,22 +3152,21 @@ bool move_inv_category_world_to_agent(const LLUUID& object_id,
         }
     }
 
-    if(drop && accept)
+    if (drop && accept)
     {
-        it = inventory_objects.begin();
         std::shared_ptr<LLMoveInv> move_inv(new LLMoveInv);
         move_inv->mObjectID = object_id;
         move_inv->mCategoryID = category_id;
         move_inv->mCallback = callback;
         move_inv->mUserData = user_data;
 
-        for ( ; it != end; ++it)
+        for (LLPointer<LLInventoryObject> obj : inventory_objects)
         {
-            two_uuids_t two(category_id, (*it)->getUUID());
+            two_uuids_t two(category_id, obj->getUUID());
             move_inv->mMoveList.push_back(two);
         }
 
-        if(is_move)
+        if (is_move)
         {
             // Callback called from within here.
             warn_move_inventory(object, move_inv);
@@ -3156,13 +3184,13 @@ bool move_inv_category_world_to_agent(const LLUUID& object_id,
 void LLRightClickInventoryFetchDescendentsObserver::execute(bool clear_observer)
 {
     // Bail out immediately if no descendents
-    if( mComplete.empty() )
+    if (mComplete.empty())
     {
         LL_WARNS() << "LLRightClickInventoryFetchDescendentsObserver::done with empty mCompleteFolders" << LL_ENDL;
         if (clear_observer)
         {
-        gInventory.removeObserver(this);
-        delete this;
+            gInventory.removeObserver(this);
+            delete this;
         }
         return;
     }
@@ -3186,13 +3214,13 @@ void LLRightClickInventoryFetchDescendentsObserver::execute(bool clear_observer)
         gInventory.getDirectDescendentsOf(*current_folder, cat_array, item_array);
 
         size_t item_count(0);
-        if( item_array )
+        if (item_array)
         {
             item_count = item_array->size();
         }
 
         size_t cat_count(0);
-        if( cat_array )
+        if (cat_array)
         {
             cat_count = cat_array->size();
         }
@@ -3291,20 +3319,16 @@ protected:
 };
 
 
-
 void LLInventoryCopyAndWearObserver::changed(U32 mask)
 {
-    if((mask & (LLInventoryObserver::ADD)) != 0)
+    if ((mask & (LLInventoryObserver::ADD)) != 0)
     {
         if (!mFolderAdded)
         {
             const std::set<LLUUID>& changed_items = gInventory.getChangedIDs();
-
-            std::set<LLUUID>::const_iterator id_it = changed_items.begin();
-            std::set<LLUUID>::const_iterator id_end = changed_items.end();
-            for (;id_it != id_end; ++id_it)
+            for (const LLUUID& item_id : changed_items)
             {
-                if ((*id_it) == mCatID)
+                if (item_id == mCatID)
                 {
                     mFolderAdded = true;
                     break;
@@ -3322,8 +3346,7 @@ void LLInventoryCopyAndWearObserver::changed(U32 mask)
             }
             else
             {
-                if (category->getDescendentCount() ==
-                    mContentsCount)
+                if (category->getDescendentCount() == mContentsCount)
                 {
                     gInventory.removeObserver(this);
                     LLAppearanceMgr::instance().wearInventoryCategory(category, false, !mReplace);
@@ -3335,8 +3358,6 @@ void LLInventoryCopyAndWearObserver::changed(U32 mask)
     }
 }
 
-
-
 void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
 {
     if ("open" == action)
@@ -3429,19 +3450,19 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
             LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
                 version_folder_id,
                 [this](bool result)
-            {
-                // todo: might need to ensure bridge/mUUID exists or this will cause crashes
-                if (!result)
                 {
-                    LLSD subs;
-                    subs["[ERROR_CODE]"] = mMessage;
-                    LLNotificationsUtil::add("MerchantListingFailed", subs);
-                }
-                else
-                {
-                    LLMarketplaceData::instance().activateListing(mUUID, true);
-                }
-            },
+                    // todo: might need to ensure bridge/mUUID exists or this will cause crashes
+                    if (!result)
+                    {
+                        LLSD subs;
+                        subs["[ERROR_CODE]"] = mMessage;
+                        LLNotificationsUtil::add("MerchantListingFailed", subs);
+                    }
+                    else
+                    {
+                        LLMarketplaceData::instance().activateListing(mUUID, true);
+                    }
+                },
                 boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3)
             );
         }
@@ -3456,19 +3477,19 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
             LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
                 mUUID,
                 [this](bool result)
-            {
-                if (!result)
                 {
-                    LLSD subs;
-                    subs["[ERROR_CODE]"] = mMessage;
-                    LLNotificationsUtil::add("MerchantFolderActivationFailed", subs);
-                }
-                else
-                {
-                    LLInventoryCategory* category = gInventory.getCategory(mUUID);
-                    LLMarketplaceData::instance().setVersionFolder(category->getParentUUID(), mUUID);
-                }
-            },
+                    if (!result)
+                    {
+                        LLSD subs;
+                        subs["[ERROR_CODE]"] = mMessage;
+                        LLNotificationsUtil::add("MerchantFolderActivationFailed", subs);
+                    }
+                    else
+                    {
+                        LLInventoryCategory* category = gInventory.getCategory(mUUID);
+                        LLMarketplaceData::instance().setVersionFolder(category->getParentUUID(), mUUID);
+                    }
+                },
                 boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
                 false,
                 2);
@@ -3500,35 +3521,35 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
         LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
             mUUID,
             [this](bool result)
-        {
-            if (!result)
             {
-                mMessage = "";
-
-                LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
-                    mUUID,
-                    [this](bool result)
+                if (!result)
                 {
-                    if (result)
-                    {
-                        LLNotificationsUtil::add("MerchantForceValidateListing");
-                        LLMarketplaceData::instance().createListing(mUUID);
-                    }
-                    else
+                    mMessage = "";
+
+                    LLMarketplaceValidator::getInstance()->validateMarketplaceListings(
+                        mUUID,
+                        [this](bool result)
                     {
-                        LLSD subs;
-                        subs["[ERROR_CODE]"] = mMessage;
-                        LLNotificationsUtil::add("MerchantListingFailed", subs);
-                    }
-                },
-                    boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
-                    true);
-            }
-            else
-            {
-                LLMarketplaceData::instance().createListing(mUUID);
-            }
-        },
+                        if (result)
+                        {
+                            LLNotificationsUtil::add("MerchantForceValidateListing");
+                            LLMarketplaceData::instance().createListing(mUUID);
+                        }
+                        else
+                        {
+                            LLSD subs;
+                            subs["[ERROR_CODE]"] = mMessage;
+                            LLNotificationsUtil::add("MerchantListingFailed", subs);
+                        }
+                    },
+                        boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
+                        true);
+                }
+                else
+                {
+                    LLMarketplaceData::instance().createListing(mUUID);
+                }
+            },
             boost::bind(&LLFolderBridge::gatherMessage, this, _1, _2, _3),
             false);
 
@@ -3607,7 +3628,7 @@ void LLFolderBridge::copyOutfitToClipboard()
     gInventory.getDirectDescendentsOf(mUUID, cat_array, item_array);
 
     size_t item_count(0);
-    if( item_array )
+    if (item_array)
     {
         item_count = item_array->size();
     }
@@ -3699,8 +3720,7 @@ void LLFolderBridge::restoreItem()
 LLFolderType::EType LLFolderBridge::getPreferredType() const
 {
     LLFolderType::EType preferred_type = LLFolderType::FT_NONE;
-    LLViewerInventoryCategory* cat = getCategory();
-    if(cat)
+    if (LLViewerInventoryCategory* cat = getCategory())
     {
         preferred_type = cat->getPreferredType();
     }
@@ -3742,7 +3762,6 @@ LLUIImagePtr LLFolderBridge::getIconOverlay() const
 
 bool LLFolderBridge::renameItem(const std::string& new_name)
 {
-
     LLScrollOnRenameObserver *observer = new LLScrollOnRenameObserver(mUUID, mRoot);
     gInventory.addObserver(observer);
 
@@ -3755,7 +3774,7 @@ bool LLFolderBridge::renameItem(const std::string& new_name)
 
 bool LLFolderBridge::removeItem()
 {
-    if(!isItemRemovable())
+    if (!isItemRemovable())
     {
         return false;
     }
@@ -3771,7 +3790,6 @@ bool LLFolderBridge::removeItem()
     return true;
 }
 
-
 bool LLFolderBridge::removeSystemFolder()
 {
     const LLViewerInventoryCategory *cat = getCategory();