15 files changed, 471 insertions, 60 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e85dee3629..fb05af0d7f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -375,6 +375,7 @@ set(viewer_SOURCE_FILES
     llinventorygallerymenu.cpp
     llinventoryicon.cpp
     llinventoryitemslist.cpp
+    llinventorylistener.cpp
     llinventorylistitem.cpp
     llinventorymodel.cpp
     llinventorymodelbackgroundfetch.cpp
@@ -1052,6 +1053,7 @@ set(viewer_HEADER_FILES
     llinventorygallerymenu.h
     llinventoryicon.h
     llinventoryitemslist.h
+    llinventorylistener.h
     llinventorylistitem.h
     llinventorymodel.h
     llinventorymodelbackgroundfetch.h
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 991d8e5c5f..6329380f96 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-7.1.13
+7.1.15
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 7710cda45b..b34eba1701 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4472,6 +4472,15 @@ void LLFolderBridge::buildContextMenuOptions(U32 flags, menuentry_vec_t&   items
         if (model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT) == mUUID)
         {
             items.push_back(std::string("Copy outfit list to clipboard"));
+            if (isFavorite())
+            {
+                items.push_back(std::string("Remove from Favorites"));
+            }
+            else
+            {
+                items.push_back(std::string("Add to Favorites"));
+            }
+
             addOpenFolderMenuOptions(flags, items);
         }
 
diff --git a/indra/newview/llinventoryfunctions.h b/indra/newview/llinventoryfunctions.h
index a668cc31d8..b40fc051a0 100644
--- a/indra/newview/llinventoryfunctions.h
+++ b/indra/newview/llinventoryfunctions.h
@@ -192,7 +192,9 @@ class LLInventoryCollectFunctor
 {
 public:
     virtual ~LLInventoryCollectFunctor(){};
-    virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) = 0;
+        virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) = 0;
+
+        virtual bool exceedsLimit() { return false; }
 
     static bool itemTransferCommonlyAllowed(const LLInventoryItem* item);
 };
diff --git a/indra/newview/llinventorylistener.cpp b/indra/newview/llinventorylistener.cpp
new file mode 100644
index 0000000000..028483e134
--- /dev/null
+++ b/indra/newview/llinventorylistener.cpp
@@ -0,0 +1,309 @@
+/**
+ * @file llinventorylistener.cpp
+ *
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2024, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llinventorylistener.h"
+
+#include "llappearancemgr.h"
+#include "llinventoryfunctions.h"
+#include "lltransutil.h"
+#include "llwearableitemslist.h"
+#include "stringize.h"
+
+LLInventoryListener::LLInventoryListener()
+  : LLEventAPI("LLInventory",
+               "API for interactions with viewer Inventory items")
+{
+    add("getItemsInfo",
+        "Return information about items or folders defined in [\"item_ids\"]:\n"
+        "reply will contain [\"items\"] and [\"categories\"] result set keys",
+        &LLInventoryListener::getItemsInfo,
+        llsd::map("item_ids", LLSD(), "reply", LLSD()));
+
+    add("getFolderTypeNames",
+        "Return the table of folder type names, contained in [\"names\"]\n",
+        &LLInventoryListener::getFolderTypeNames,
+        llsd::map("reply", LLSD()));
+
+    add("getAssetTypeNames",
+        "Return the table of asset type names, contained in [\"names\"]\n",
+        &LLInventoryListener::getAssetTypeNames,
+        llsd::map("reply", LLSD()));
+
+    add("getBasicFolderID",
+        "Return the UUID of the folder by specified folder type name, for example:\n"
+        "\"Textures\", \"My outfits\", \"Sounds\" and other basic folders which have associated type",
+        &LLInventoryListener::getBasicFolderID,
+        llsd::map("ft_name", LLSD(), "reply", LLSD()));
+
+    add("getDirectDescendants",
+        "Return result set keys [\"categories\"] and [\"items\"] for the direct\n"
+        "descendants of the [\"folder_id\"]",
+        &LLInventoryListener::getDirectDescendants,
+        llsd::map("folder_id", LLSD(), "reply", LLSD()));
+
+    add("collectDescendantsIf",
+        "Return result set keys [\"categories\"] and [\"items\"] for the descendants\n"
+        "of the [\"folder_id\"], if it passes specified filters:\n"
+        "[\"name\"] is a substring of object's name,\n"
+        "[\"desc\"] is a substring of object's description,\n"
+        "asset [\"type\"] corresponds to the string name of the object's asset type\n"
+        "[\"limit\"] sets item count limit in result set (default unlimited)\n"
+        "[\"filter_links\"]: EXCLUDE_LINKS - don't show links, ONLY_LINKS - only show links, INCLUDE_LINKS - show links too (default)",
+        &LLInventoryListener::collectDescendantsIf,
+        llsd::map("folder_id", LLSD(), "reply", LLSD()));
+}
+
+void add_cat_info(LLEventAPI::Response& response, LLViewerInventoryCategory* cat)
+{
+    response["categories"].insert(cat->getUUID().asString(),
+                                  llsd::map("id", cat->getUUID(),
+                                            "name", cat->getName(),
+                                            "parent_id", cat->getParentUUID(),
+                                            "type", LLFolderType::lookup(cat->getPreferredType())));
+
+};
+
+void add_item_info(LLEventAPI::Response& response, LLViewerInventoryItem* item)
+{
+    response["items"].insert(item->getUUID().asString(),
+                             llsd::map("id", item->getUUID(),
+                                       "name", item->getName(),
+                                       "parent_id", item->getParentUUID(),
+                                       "desc", item->getDescription(),
+                                       "inv_type", LLInventoryType::lookup(item->getInventoryType()),
+                                       "asset_type", LLAssetType::lookup(item->getType()),
+                                       "creation_date", LLSD::Integer(item->getCreationDate()),
+                                       "asset_id", item->getAssetUUID(),
+                                       "is_link", item->getIsLinkType(),
+                                       "linked_id", item->getLinkedUUID()));
+}
+
+void add_objects_info(LLEventAPI::Response& response, LLInventoryModel::cat_array_t cat_array, LLInventoryModel::item_array_t item_array)
+{
+    for (auto& p : item_array)
+    {
+        add_item_info(response, p);
+    }
+    for (auto& p : cat_array)
+    {
+        add_cat_info(response, p);
+    }
+}
+
+void LLInventoryListener::getItemsInfo(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    uuid_vec_t ids = LLSDParam<uuid_vec_t>(data["item_ids"]);
+    for (auto &it : ids)
+    {
+        LLViewerInventoryItem* item = gInventory.getItem(it);
+        if (item)
+        {
+            add_item_info(response, item);
+        }
+        else
+        {
+            LLViewerInventoryCategory *cat = gInventory.getCategory(it);
+            if (cat)
+            {
+                add_cat_info(response, cat);
+            }
+        }
+    }
+}
+
+void LLInventoryListener::getFolderTypeNames(LLSD const &data)
+{
+    Response response(llsd::map("names", LLFolderType::getTypeNames()), data);
+}
+
+void LLInventoryListener::getAssetTypeNames(LLSD const &data)
+{
+    Response response(llsd::map("names", LLAssetType::getTypeNames()), data);
+}
+
+void LLInventoryListener::getBasicFolderID(LLSD const &data)
+{
+    Response response(llsd::map("id", gInventory.findCategoryUUIDForType(LLFolderType::lookup(data["ft_name"].asString()))), data);
+}
+
+
+void LLInventoryListener::getDirectDescendants(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    LLUUID folder_id(data["folder_id"].asUUID());
+    LLViewerInventoryCategory* cat = gInventory.getCategory(folder_id);
+    if (!cat)
+    {
+        return response.error(stringize("Folder ", std::quoted(data["folder_id"].asString()), " was not found"));
+    }
+    LLInventoryModel::cat_array_t* cats;
+    LLInventoryModel::item_array_t* items;
+    gInventory.getDirectDescendentsOf(folder_id, cats, items);
+
+    add_objects_info(response, *cats, *items);
+}
+
+struct LLFilteredCollector : public LLInventoryCollectFunctor
+{
+    enum EFilterLink
+    {
+        INCLUDE_LINKS,  // show links too
+        EXCLUDE_LINKS,  // don't show links
+        ONLY_LINKS      // only show links
+    };
+
+    LLFilteredCollector(LLSD const &data);
+    virtual ~LLFilteredCollector() {}
+    virtual bool operator()(LLInventoryCategory *cat, LLInventoryItem *item) override;
+    virtual bool exceedsLimit() override
+    {
+        // mItemLimit == 0 means unlimited
+        return (mItemLimit && mItemLimit <= mItemCount);
+    }
+
+  protected:
+    bool checkagainstType(LLInventoryCategory *cat, LLInventoryItem *item);
+    bool checkagainstNameDesc(LLInventoryCategory *cat, LLInventoryItem *item);
+    bool checkagainstLinks(LLInventoryCategory *cat, LLInventoryItem *item);
+
+    LLAssetType::EType mType;
+    std::string mName;
+    std::string mDesc;
+    EFilterLink mLinkFilter;
+
+    S32 mItemLimit;
+    S32 mItemCount;
+};
+
+void LLInventoryListener::collectDescendantsIf(LLSD const &data)
+{
+    Response response(LLSD(), data);
+    LLUUID folder_id(data["folder_id"].asUUID());
+    LLViewerInventoryCategory *cat = gInventory.getCategory(folder_id);
+    if (!cat)
+    {
+        return response.error(stringize("Folder ", std::quoted(data["folder_id"].asString()), " was not found"));
+    }
+    LLInventoryModel::cat_array_t  cat_array;
+    LLInventoryModel::item_array_t item_array;
+
+    LLFilteredCollector collector = LLFilteredCollector(data);
+
+    gInventory.collectDescendentsIf(folder_id, cat_array, item_array, LLInventoryModel::EXCLUDE_TRASH, collector);
+
+    add_objects_info(response, cat_array, item_array);
+}
+
+LLFilteredCollector::LLFilteredCollector(LLSD const &data) :
+    mType(LLAssetType::EType::AT_UNKNOWN),
+    mLinkFilter(INCLUDE_LINKS),
+    mItemLimit(0),
+    mItemCount(0)
+{
+
+    mName = data["name"].asString();
+    mDesc = data["desc"].asString();
+
+    if (data.has("type"))
+    {
+        mType = LLAssetType::lookup(data["type"]);
+    }
+    if (data.has("filter_links"))
+    {
+        if (data["filter_links"] == "EXCLUDE_LINKS")
+        {
+            mLinkFilter = EXCLUDE_LINKS;
+        }
+        else if (data["filter_links"] == "ONLY_LINKS")
+        {
+            mLinkFilter = ONLY_LINKS;
+        }
+    }
+    if (data["limit"].isInteger())
+    {
+        mItemLimit = std::max(data["limit"].asInteger(), 1);
+    }
+}
+
+bool LLFilteredCollector::operator()(LLInventoryCategory *cat, LLInventoryItem *item)
+{
+    bool passed = checkagainstType(cat, item);
+    passed = passed && checkagainstNameDesc(cat, item);
+    passed = passed && checkagainstLinks(cat, item);
+
+    if (passed)
+    {
+        ++mItemCount;
+    }
+    return passed;
+}
+
+bool LLFilteredCollector::checkagainstNameDesc(LLInventoryCategory *cat, LLInventoryItem *item)
+{
+    std::string name, desc;
+    bool passed(true);
+    if (cat)
+    {
+        if (!mDesc.empty()) return false;
+        name = cat->getName();
+    }
+    if (item)
+    {
+        name = item->getName();
+        passed = (mDesc.empty() || (item->getDescription().find(mDesc) != std::string::npos));
+    }
+
+    return passed && (mName.empty() || name.find(mName) != std::string::npos);
+}
+
+bool LLFilteredCollector::checkagainstType(LLInventoryCategory *cat, LLInventoryItem *item)
+{
+    if (mType == LLAssetType::AT_UNKNOWN)
+    {
+        return true;
+    }
+    if (cat && (mType == LLAssetType::AT_CATEGORY))
+    {
+        return true;
+    }
+    if (item && item->getType() == mType)
+    {
+        return true;
+    }
+    return false;
+}
+
+bool LLFilteredCollector::checkagainstLinks(LLInventoryCategory *cat, LLInventoryItem *item)
+{
+    bool is_link = cat ? cat->getIsLinkType() : item->getIsLinkType();
+    if (is_link && (mLinkFilter == EXCLUDE_LINKS))
+        return false;
+    if (!is_link && (mLinkFilter == ONLY_LINKS))
+        return false;
+    return true;
+}
diff --git a/indra/newview/llinventorylistener.h b/indra/newview/llinventorylistener.h
new file mode 100644
index 0000000000..d50397730c
--- /dev/null
+++ b/indra/newview/llinventorylistener.h
@@ -0,0 +1,48 @@
+/**
+ * @file llinventorylistener.h
+ *
+ * $LicenseInfo:firstyear=2024&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2024, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
+ * $/LicenseInfo$
+ */
+
+
+#ifndef LL_LLINVENTORYLISTENER_H
+#define LL_LLINVENTORYLISTENER_H
+
+#include "lleventapi.h"
+#include "llinventoryfunctions.h"
+
+class LLInventoryListener : public LLEventAPI
+{
+public:
+    LLInventoryListener();
+
+private:
+    void getItemsInfo(LLSD const &data);
+    void getFolderTypeNames(LLSD const &data);
+    void getAssetTypeNames(LLSD const &data);
+    void getBasicFolderID(LLSD const &data);
+    void getDirectDescendants(LLSD const &data);
+    void collectDescendantsIf(LLSD const &data);
+};
+
+#endif // LL_LLINVENTORYLISTENER_H
+
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index bc33f29c33..3a07caefda 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1282,6 +1282,10 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
     {
         for (auto& cat : *cat_array)
         {
+            if (add.exceedsLimit())
+            {
+                break;
+            }
             if(add(cat,NULL))
             {
                 cats.push_back(cat);
@@ -1297,6 +1301,10 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
     {
         for (auto& item : *item_array)
         {
+            if (add.exceedsLimit())
+            {
+                break;
+            }
             if(add(NULL, item))
             {
                 items.push_back(item);
@@ -3500,7 +3508,9 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
         {
             if (cat->getVersion() != LLViewerInventoryCategory::VERSION_UNKNOWN)
             {
-                fileXML << LLSDOStreamer<LLSDNotationFormatter>(cat->exportLLSD()) << std::endl;
+                LLSD sd = LLSD::emptyMap();
+                cat->exportLLSD(sd);
+                fileXML << LLSDOStreamer<LLSDNotationFormatter>(sd) << std::endl;
                 cat_count++;
             }
 
@@ -3514,7 +3524,9 @@ bool LLInventoryModel::saveToFile(const std::string& filename,
         auto it_count = items.size();
         for (auto& item : items)
         {
-            fileXML << LLSDOStreamer<LLSDNotationFormatter>(item->asLLSD()) << std::endl;
+            LLSD sd = LLSD::emptyMap();
+            item->asLLSD(sd);
+            fileXML << LLSDOStreamer<LLSDNotationFormatter>(sd) << std::endl;
 
             if (fileXML.fail())
             {
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 1f6da85d22..ffac62aae8 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -779,7 +779,7 @@ void LLInventoryPanel::modelChanged(U32 mask)
 {
     LL_PROFILE_ZONE_SCOPED;
 
-    if (mViewsInitialized != VIEWS_INITIALIZED) return;
+    if (mViewsInitialized != VIEWS_INITIALIZED) return; // todo: Store changes if building?
 
     const LLInventoryModel* model = getModel();
     if (!model) return;
@@ -942,6 +942,11 @@ void LLInventoryPanel::idle(void* user_data)
             panel->mViewsInitialized = VIEWS_INITIALIZED;
         }
     }
+    // in case panel is empty or only has 'roots'
+    else if (panel->mViewsInitialized == VIEWS_BUILDING)
+    {
+        panel->mViewsInitialized = VIEWS_INITIALIZED;
+    }
 
     // Take into account the fact that the root folder might be invalidated
     if (panel->mFolderRoot.get())
@@ -2436,7 +2441,8 @@ bool LLInventoryFavoritesItemsPanel::removeFavorite(const LLUUID& id, const LLIn
 
 void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, const LLInventoryObject* model_item)
 {
-    if (!model_item && !getItemByID(id))
+    LLFolderViewItem* view_item = getItemByID(id);
+    if (!model_item && !view_item)
     {
         // remove operation, but item is not in panel already
         return;
@@ -2452,7 +2458,6 @@ void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, con
         // specifically exlude links and not get_is_favorite(model_item)
         if (model_item && model_item->getIsFavorite())
         {
-            LLFolderViewItem* view_item = getItemByID(id);
             if (!view_item)
             {
                 const LLViewerInventoryCategory* cat = dynamic_cast<const LLViewerInventoryCategory*>(model_item);
@@ -2516,7 +2521,8 @@ void LLInventoryFavoritesItemsPanel::itemChanged(const LLUUID& id, U32 mask, con
         }
     }
 
-    if (!handled)
+    if (!handled
+        && (!model_item || model_item->getParentUUID().notNull())) // filter out 'My inventory'
     {
         LLInventoryPanel::itemChanged(id, mask, model_item);
     }
diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index 0a3a2e753a..23e6a9fbcf 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -2267,19 +2267,21 @@ void LLPanelObject::onCopyParams()
     if (objectp->getParameterEntryInUse(LLNetworkData::PARAMS_SCULPT))
     {
         LLSculptParams *sculpt_params = (LLSculptParams *)objectp->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-
-        LLUUID texture_id = sculpt_params->getSculptTexture();
-        if (get_can_copy_texture(texture_id))
-        {
-            LL_DEBUGS("FloaterTools") << "Recording texture" << LL_ENDL;
-            mClipboardParams["sculpt"]["id"] = texture_id;
-        }
-        else
+        if (sculpt_params)
         {
-            mClipboardParams["sculpt"]["id"] = SCULPT_DEFAULT_TEXTURE;
-        }
+            LLUUID texture_id = sculpt_params->getSculptTexture();
+            if (get_can_copy_texture(texture_id))
+            {
+                LL_DEBUGS("FloaterTools") << "Recording texture" << LL_ENDL;
+                mClipboardParams["sculpt"]["id"] = texture_id;
+            }
+            else
+            {
+                mClipboardParams["sculpt"]["id"] = SCULPT_DEFAULT_TEXTURE;
+            }
 
-        mClipboardParams["sculpt"]["type"] = sculpt_params->getSculptType();
+            mClipboardParams["sculpt"]["type"] = sculpt_params->getSculptType();
+        }
     }
 }
 
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index ff01e537ee..d3c553fe50 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -163,7 +163,6 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
     mFallbackImage(fallback_image),
     mDefaultImageAssetID(default_image_asset_id),
     mBlankImageAssetID(blank_image_asset_id),
-    mTentative(tentative),
     mAllowNoTexture(allow_no_texture),
     mLabel(label),
     mTentativeLabel(NULL),
@@ -188,6 +187,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker(
     mLocalTextureEnabled(false),
     mInventoryPickType(pick_type)
 {
+    setTentative(tentative);
     mCanApplyImmediately = can_apply_immediately;
     buildFromFile("floater_texture_ctrl.xml");
     setCanMinimize(false);
@@ -199,7 +199,7 @@ LLFloaterTexturePicker::~LLFloaterTexturePicker()
 
 void LLFloaterTexturePicker::setImageID(const LLUUID& image_id, bool set_selection /*=true*/)
 {
-    if( ((mImageAssetID != image_id) || mTentative) && mActive)
+    if( ((mImageAssetID != image_id) || getTentative()) && mActive)
     {
         mNoCopyTextureSelected = false;
         mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
@@ -277,6 +277,7 @@ void LLFloaterTexturePicker::setImageIDFromItem(const LLInventoryItem* itemp, bo
         asset_id = BLANK_MATERIAL_ASSET_ID;
     }
     setImageID(asset_id, set_selection);
+    setTentative(false);
 }
 
 void LLFloaterTexturePicker::setActive( bool active )
@@ -657,7 +658,7 @@ void LLFloaterTexturePicker::draw()
     bool valid_dims = updateImageStats();
 
     // if we're inactive, gray out "apply immediate" checkbox
-    mSelectBtn->setEnabled(mActive && mCanApply && valid_dims);
+    mSelectBtn->setEnabled(mActive && mCanApply && valid_dims && !getTentative());
     mPipetteBtn->setEnabled(mActive);
     mPipetteBtn->setValue(LLToolMgr::getInstance()->getCurrentTool() == LLToolPipette::getInstance());
 
@@ -722,9 +723,9 @@ void LLFloaterTexturePicker::draw()
             mTentativeLabel->setVisible( false  );
         }
 
-        mDefaultBtn->setEnabled(mImageAssetID != mDefaultImageAssetID || mTentative);
-        mBlankBtn->setEnabled((mImageAssetID != mBlankImageAssetID && mBlankImageAssetID.notNull()) || mTentative);
-        mNoneBtn->setEnabled(mAllowNoTexture && (!mImageAssetID.isNull() || mTentative));
+        mDefaultBtn->setEnabled(mImageAssetID != mDefaultImageAssetID || getTentative());
+        mBlankBtn->setEnabled((mImageAssetID != mBlankImageAssetID && mBlankImageAssetID.notNull()) || getTentative());
+        mNoneBtn->setEnabled(mAllowNoTexture && (!mImageAssetID.isNull() || getTentative()));
 
         LLFloater::draw();
 
@@ -777,7 +778,7 @@ void LLFloaterTexturePicker::draw()
         }
 
         // Draw Tentative Label over the image
-        if( mTentative && !mViewModel->isDirty() )
+        if( getTentative() && !mViewModel->isDirty() )
         {
             mTentativeLabel->setVisible( true );
             drawChild(mTentativeLabel);
@@ -980,6 +981,7 @@ void LLFloaterTexturePicker::onBtnSetToDefault(void* userdata)
     if (self->mOwner)
     {
         self->setImageID( self->getDefaultImageAssetID() );
+        self->setTentative(false);
     }
     self->commitIfImmediateSet();
 }
@@ -990,6 +992,7 @@ void LLFloaterTexturePicker::onBtnBlank(void* userdata)
     LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
     self->setCanApply(true, true);
     self->setImageID( self->getBlankImageAssetID() );
+    self->setTentative(false);
     self->commitIfImmediateSet();
 }
 
@@ -1000,21 +1003,10 @@ void LLFloaterTexturePicker::onBtnNone(void* userdata)
     LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
     self->setCanApply(true, true);
     self->setImageID( LLUUID::null );
+    self->setTentative(false);
     self->commitIfImmediateSet();
 }
 
-/*
-// static
-void LLFloaterTexturePicker::onBtnRevert(void* userdata)
-{
-    LLFloaterTexturePicker* self = (LLFloaterTexturePicker*) userdata;
-    self->setImageID( self->mOriginalImageAssetID );
-    // TODO: Change this to tell the owner to cancel.  It needs to be
-    // smart enough to restore multi-texture selections.
-    self->mOwner->onFloaterCommit();
-    self->mViewModel->resetDirty();
-}*/
-
 // static
 void LLFloaterTexturePicker::onBtnCancel(void* userdata)
 {
@@ -1221,6 +1213,7 @@ void LLFloaterTexturePicker::onLocalScrollCommit(LLUICtrl* ctrl, void* userdata)
         if (self->mSetImageAssetIDCallback)
         {
             self->mSetImageAssetIDCallback(inworld_id);
+            self->setTentative(false);
         }
 
         if (self->childGetValue("apply_immediate_check").asBoolean())
@@ -1299,6 +1292,7 @@ void LLFloaterTexturePicker::onBakeTextureSelect(LLUICtrl* ctrl, void *user_data
     }
 
     self->setImageID(imageID);
+    self->setTentative(false);
     self->mViewModel->setDirty(); // *TODO: shouldn't we be using setValue() here?
 
     if (!self->mPreviewSettingChanged)
@@ -1319,7 +1313,7 @@ void LLFloaterTexturePicker::onBakeTextureSelect(LLUICtrl* ctrl, void *user_data
 
 void LLFloaterTexturePicker::setCanApply(bool can_preview, bool can_apply, bool inworld_image)
 {
-    mSelectBtn->setEnabled(can_apply);
+    mSelectBtn->setEnabled(can_apply && !getTentative()); // will be updated on draw
     getChildRef<LLUICtrl>("preview_disabled").setVisible(!can_preview && inworld_image);
     getChildRef<LLUICtrl>("apply_immediate_check").setVisible(can_preview);
 
@@ -1626,6 +1620,7 @@ void LLFloaterTexturePicker::onTextureSelect( const LLTextureEntry& te )
         else
         {
             setImageID(te.getID());
+            setTentative(false);
         }
 
         mNoCopyTextureSelected = false;
@@ -1839,6 +1834,17 @@ void LLTextureCtrl::clear()
     setImageAssetID(LLUUID::null);
 }
 
+void LLTextureCtrl::setTentative(bool tentative)
+{
+    LLFloater* floaterp = mFloaterHandle.get();
+
+    if (floaterp)
+    {
+        floaterp->setTentative(tentative);
+    }
+    LLUICtrl::setTentative(tentative);
+}
+
 void LLTextureCtrl::setLabel(const std::string& label)
 {
     mLabel = label;
@@ -2112,6 +2118,7 @@ void LLTextureCtrl::setImageAssetID( const LLUUID& asset_id )
         if( floaterp && getEnabled() )
         {
             floaterp->setImageID( asset_id );
+            floaterp->setTentative(getTentative());
             floaterp->resetDirty();
         }
     }
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h
index 581242cc53..79957431b7 100644
--- a/indra/newview/lltexturectrl.h
+++ b/indra/newview/lltexturectrl.h
@@ -167,6 +167,8 @@ public:
     // LLUICtrl interface
     void clear() override;
 
+    void setTentative(bool b) override;
+
     // Takes a UUID, wraps get/setImageAssetID
     void setValue(const LLSD& value) override;
     LLSD getValue() const override;
@@ -405,7 +407,6 @@ protected:
     LLUIImagePtr        mFallbackImage; // What to show if currently selected texture is null.
     LLUUID              mDefaultImageAssetID;
     LLUUID              mBlankImageAssetID;
-    bool                mTentative;
     bool                mAllowNoTexture;
     LLUUID              mSpecialCurrentImageAssetID;  // Used when the asset id has no corresponding texture in the user's inventory.
     LLUUID              mOriginalImageAssetID;
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 36ec6f0d78..5f61aeaf13 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -71,6 +71,9 @@
 #include "llclipboard.h"
 #include "llhttpretrypolicy.h"
 #include "llsettingsvo.h"
+#include "llinventorylistener.h"
+
+LLInventoryListener sInventoryListener;
 
 // do-nothing ops for use in callbacks.
 void no_op_inventory_func(const LLUUID&) {}
@@ -751,13 +754,11 @@ S32 LLViewerInventoryCategory::getViewerDescendentCount() const
     return descendents_actual;
 }
 
-LLSD LLViewerInventoryCategory::exportLLSD() const
+void LLViewerInventoryCategory::exportLLSD(LLSD & cat_data) const
 {
-    LLSD cat_data = LLInventoryCategory::exportLLSD();
+    LLInventoryCategory::exportLLSD(cat_data);
     cat_data[INV_OWNER_ID] = mOwnerID;
     cat_data[INV_VERSION] = mVersion;
-
-    return cat_data;
 }
 
 bool LLViewerInventoryCategory::importLLSD(const LLSD& cat_data)
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 18daa368d9..5cd31353f8 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -232,8 +232,8 @@ public:
     // How many descendents do we currently have information for in the InventoryModel?
     S32 getViewerDescendentCount() const;
 
-    LLSD exportLLSD() const;
-    bool importLLSD(const LLSD& cat_data);
+    virtual void exportLLSD(LLSD &sd) const;
+    virtual bool importLLSD(const LLSD& cat_data);
 
     void determineFolderType();
     void changeType(LLFolderType::EType new_folder_type);
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 8d90187e91..9e77b40a45 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -4184,8 +4184,11 @@ void LLViewerObject::boostTexturePriority(bool boost_children /* = true */)
     if (isSculpted() && !isMesh())
     {
         LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-        LLUUID sculpt_id = sculpt_params->getSculptTexture();
-        LLViewerTextureManager::getFetchedTexture(sculpt_id, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
+        if (sculpt_params)
+        {
+            LLUUID sculpt_id = sculpt_params->getSculptTexture();
+            LLViewerTextureManager::getFetchedTexture(sculpt_id, FTT_DEFAULT, true, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
+        }
     }
 
     if (boost_children)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 4867a5c279..6d7f0dab40 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -352,8 +352,11 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
     if (isSculpted())
     {
         LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-        sculpt_id = sculpt_params->getSculptTexture();
-        sculpt_type = sculpt_params->getSculptType();
+        if (sculpt_params)
+        {
+            sculpt_id = sculpt_params->getSculptTexture();
+            sculpt_type = sculpt_params->getSculptType();
+        }
 
         LL_DEBUGS("ObjectUpdate") << "uuid " << mID << " set sculpt_id " << sculpt_id << LL_ENDL;
     }
@@ -1188,12 +1191,15 @@ void LLVOVolume::updateSculptTexture()
     if (isSculpted() && !isMesh())
     {
         LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-        LLUUID id =  sculpt_params->getSculptTexture();
-        if (id.notNull())
+        if (sculpt_params)
         {
-            mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, true, LLGLTexture::BOOST_SCULPTED, LLViewerTexture::LOD_TEXTURE);
-            mSculptTexture->forceToSaveRawImage(0, F32_MAX);
-            mSculptTexture->setKnownDrawSize(256, 256);
+            LLUUID id = sculpt_params->getSculptTexture();
+            if (id.notNull())
+            {
+                mSculptTexture = LLViewerTextureManager::getFetchedTexture(id, FTT_DEFAULT, true, LLGLTexture::BOOST_SCULPTED, LLViewerTexture::LOD_TEXTURE);
+                mSculptTexture->forceToSaveRawImage(0, F32_MAX);
+                mSculptTexture->setKnownDrawSize(256, 256);
+            }
         }
 
         mSkinInfoUnavaliable = false;
@@ -3580,12 +3586,15 @@ bool LLVOVolume::isMesh() const
     if (isSculpted())
     {
         LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-        U8 sculpt_type = sculpt_params->getSculptType();
-
-        if ((sculpt_type & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)
-            // mesh is a mesh
+        if (sculpt_params)
         {
-            return true;
+            U8 sculpt_type = sculpt_params->getSculptType();
+
+            if ((sculpt_type & LL_SCULPT_TYPE_MASK) == LL_SCULPT_TYPE_MESH)
+                // mesh is a mesh
+            {
+                return true;
+            }
         }
     }