livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-19533 Don't try to restart fetchexcessively 

No real point restarting, but due to significant changes decided to keep this around and raise asserts instead of removing.
master
Andrey Kleshchev 2023-04-11 21:20:30 +03:00
parent 8171224a65
commit af30c8c95b
5 changed files with 36 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatermarketplacelistings.cpp
View File

@ -448,7 +448,7 @@ void LLFloaterMarketplaceListings::fetchContents()
{
LLMarketplaceData::instance().setDataFetchedSignal(boost::bind(&LLFloaterMarketplaceListings::updateView, this));
LLMarketplaceData::instance().setSLMDataFetched(MarketplaceFetchCodes::MARKET_FETCH_LOADING);
LLInventoryModelBackgroundFetch::instance().start(mRootFolderId);
LLInventoryModelBackgroundFetch::instance().start(mRootFolderId, true);
LLMarketplaceData::instance().getSLMListings();
}
}

18
indra/newview/llpanelmaininventory.cpp
View File

@ -738,7 +738,11 @@ void LLPanelMainInventory::onFilterEdit(const std::string& search_string )
return;
}
LLInventoryModelBackgroundFetch::instance().start();
if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
llassert(false); // this should have been done on startup
LLInventoryModelBackgroundFetch::instance().start();
}
mFilterSubString = search_string;
if (mActivePanel->getFilterSubString().empty() && mFilterSubString.empty())
@ -835,9 +839,9 @@ void LLPanelMainInventory::onFilterSelected()
finder->setTitle(getLocalizedRootName());
}
}
if (filter.isActive())
if (filter.isActive() && !LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
// If our filter is active we may be the first thing requiring a fetch so we better start it here.
llassert(false); // this should have been done on startup
LLInventoryModelBackgroundFetch::instance().start();
}
setFilterTextFromFilter();
@ -995,8 +999,12 @@ void LLPanelMainInventory::toggleFindOptions()
LLFloater* parent_floater = gFloaterView->getParentFloater(this);
if (parent_floater)
parent_floater->addDependentFloater(mFinderHandle);
// start background fetch of folders
LLInventoryModelBackgroundFetch::instance().start();
if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
llassert(false); // this should have been done on startup
LLInventoryModelBackgroundFetch::instance().start();
}
if (mSingleFolderMode)
{

16
indra/newview/llpaneloutfitedit.cpp
View File

@ -699,8 +699,12 @@ void LLPanelOutfitEdit::onFolderViewFilterCommitted(LLUICtrl* ctrl)
LLOpenFoldersWithSelection opener;
mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(opener);
mInventoryItemsPanel->getRootFolder()->scrollToShowSelection();
LLInventoryModelBackgroundFetch::instance().start();
if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
llassert(false); // this should have been done on startup
LLInventoryModelBackgroundFetch::instance().start();
}
}
void LLPanelOutfitEdit::onListViewFilterCommitted(LLUICtrl* ctrl)
@ -737,8 +741,12 @@ void LLPanelOutfitEdit::onSearchEdit(const std::string& string)
mInventoryItemsPanel->getRootFolder()->applyFunctorRecursively(opener);
mInventoryItemsPanel->getRootFolder()->scrollToShowSelection();
}
LLInventoryModelBackgroundFetch::instance().start();
if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
llassert(false); // this should have been done on startup
LLInventoryModelBackgroundFetch::instance().start();
}
if (mInventoryItemsPanel->getFilterSubString().empty() && mSearchString.empty())
{

6
indra/newview/llpaneloutfitsinventory.cpp
View File

@ -166,7 +166,11 @@ void LLPanelOutfitsInventory::onSearchEdit(const std::string& string)
mActivePanel->setFilterSubString(LLStringUtil::null);
}
LLInventoryModelBackgroundFetch::instance().start();
if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
llassert(false); // this should have been done on startup
LLInventoryModelBackgroundFetch::instance().start();
}
if (mActivePanel->getFilterSubString().empty() && string.empty())
{

7
indra/newview/lltexturectrl.cpp
View File

@ -1478,8 +1478,11 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
showPicker(FALSE);
//grab textures first...
LLInventoryModelBackgroundFetch::instance().start(gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE));
//...then start full inventory fetch.
LLInventoryModelBackgroundFetch::instance().start();
//...then start full inventory fetch (should have been done on startup, but just in case.
if (!LLInventoryModelBackgroundFetch::instance().inventoryFetchStarted())
{
LLInventoryModelBackgroundFetch::instance().start();
}
handled = TRUE;
}
else