Merge branch 'main' into marchcat/x-mf-merge

# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp

1 files changed, 47 insertions, 9 deletions

diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index ceeefd7415..97e1c1e6ee 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -1398,7 +1398,7 @@ const std::string LLAppearanceMgr::sExpectedTextureName = "OutfitPreview";
 
 const LLUUID LLAppearanceMgr::getCOF() const
 {
-    return gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+    return mCOFID;
 }
 
 S32 LLAppearanceMgr::getCOFVersion() const
@@ -1414,6 +1414,11 @@ S32 LLAppearanceMgr::getCOFVersion() const
     }
 }
 
+void LLAppearanceMgr::initCOFID()
+{
+    mCOFID = gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT);
+}
+
 const LLViewerInventoryItem* LLAppearanceMgr::getBaseOutfitLink()
 {
     const LLUUID& current_outfit_cat = getCOF();
@@ -3762,6 +3767,14 @@ LLSD LLAppearanceMgr::dumpCOF() const
     return result;
 }
 
+void LLAppearanceMgr::cleanup()
+{
+    mIsInUpdateAppearanceFromCOF = false;
+    mOutstandingAppearanceBakeRequest = false;
+    mRerequestAppearanceBake = false;
+    mCOFID.setNull();
+}
+
 // static
 void LLAppearanceMgr::onIdle(void *)
 {
@@ -4130,7 +4143,7 @@ void LLAppearanceMgr::wearBaseOutfit()
     updateCOF(base_outfit_id);
 }
 
-void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove)
+void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove, nullary_func_t post_update_func)
 {
     LL_DEBUGS("UIUsage") << "removeItemsFromAvatar" << LL_ENDL;
     LLUIUsage::instance().logCommand("Avatar.RemoveItem");
@@ -4140,7 +4153,7 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove)
         LL_WARNS() << "called with empty list, nothing to do" << LL_ENDL;
         return;
     }
-    LLPointer<LLInventoryCallback> cb = new LLUpdateAppearanceOnDestroy;
+    LLPointer<LLInventoryCallback> cb = new LLUpdateAppearanceOnDestroy(true, true, post_update_func);
     for (uuid_vec_t::const_iterator it = ids_to_remove.begin(); it != ids_to_remove.end(); ++it)
     {
         const LLUUID& id_to_remove = *it;
@@ -4159,11 +4172,11 @@ void LLAppearanceMgr::removeItemsFromAvatar(const uuid_vec_t& ids_to_remove)
     }
 }
 
-void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove)
+void LLAppearanceMgr::removeItemFromAvatar(const LLUUID& id_to_remove, nullary_func_t post_update_func)
 {
     uuid_vec_t ids_to_remove;
     ids_to_remove.push_back(id_to_remove);
-    removeItemsFromAvatar(ids_to_remove);
+    removeItemsFromAvatar(ids_to_remove, post_update_func);
 }
 
 
@@ -4400,20 +4413,45 @@ BOOL LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const
     return FALSE;
 }
 
-BOOL LLAppearanceMgr::getIsProtectedCOFItem(const LLUUID& obj_id) const
+bool LLAppearanceMgr::getIsInCOF(const LLInventoryObject* obj) const
+{
+    const LLUUID& cof = getCOF();
+    if (obj->getUUID() == cof)
+        return true;
+    if (obj && obj->getParentUUID() == cof)
+        return true;
+    return false;
+}
+
+bool LLAppearanceMgr::getIsProtectedCOFItem(const LLUUID& obj_id) const
 {
-    if (!getIsInCOF(obj_id)) return FALSE;
+    if (!getIsInCOF(obj_id)) return false;
 
     // If a non-link somehow ended up in COF, allow deletion.
     const LLInventoryObject *obj = gInventory.getObject(obj_id);
     if (obj && !obj->getIsLinkType())
     {
-        return FALSE;
+        return false;
+    }
+
+    // For now, don't allow direct deletion from the COF.  Instead, force users
+    // to choose "Detach" or "Take Off".
+    return true;
+}
+
+bool LLAppearanceMgr::getIsProtectedCOFItem(const LLInventoryObject* obj) const
+{
+    if (!getIsInCOF(obj)) return false;
+
+    // If a non-link somehow ended up in COF, allow deletion.
+    if (obj && !obj->getIsLinkType())
+    {
+        return false;
     }
 
     // For now, don't allow direct deletion from the COF.  Instead, force users
     // to choose "Detach" or "Take Off".
-    return TRUE;
+    return true;
 }
 
 class CallAfterCategoryFetchStage2: public LLInventoryFetchItemsObserver