From 110ed8f4d3152c91ddd7577234ad37b666be86c9 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Tue, 28 Mar 2023 00:53:35 +0300
Subject: SL-18003 Don't cause excessive full rebuild
---
indra/newview/llinventorymodel.cpp | 3 +++
indra/newview/llinventorymodelbackgroundfetch.cpp | 3 ---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 4c2383d211..47fd17ef86 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1759,6 +1759,9 @@ void LLInventoryModel::changeCategoryParent(LLViewerInventoryCategory* cat,
void LLInventoryModel::rebuildBrockenLinks()
{
+ // make sure we aren't adding expensive Rebuild to anything else.
+ notifyObservers();
+
for (LLUUID link_id : mPossiblyBrockenLinks)
{
addChangedMask(LLInventoryObserver::REBUILD, link_id);
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index 21f7e3e059..25e35915c3 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -372,9 +372,6 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
//LL_INFOS(LOG_INV) << "All folders fetched, validating" << LL_ENDL;
//gInventory.validate();
- gInventory.addChangedMask(LLInventoryObserver::INTERNAL, gInventory.getRootFolderID());
- gInventory.addChangedMask(LLInventoryObserver::INTERNAL, gInventory.getLibraryRootFolderID());
-
// For now only informs about initial fetch being done
mAllFoldersFetchedSignal();
}
--
cgit v1.2.3