FIRE-34403: Presumable fix for inventory loading on OpenSim
parent
60313bc9c3
commit
00788cb97f
|
|
@ -389,14 +389,14 @@ void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id,
|
|||
if (mForceFetchSet.find(cat_id) == mForceFetchSet.end())
|
||||
{
|
||||
mForceFetchSet.insert(cat_id);
|
||||
mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_FORCED));
|
||||
mFetchFolderQueue.emplace_front(FetchQueueInfo(cat_id, FT_FORCED));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Specific folder requests go to front of queue.
|
||||
// version presence acts as dupplicate prevention for normal fetches
|
||||
mFetchItemQueue.push_front(FetchQueueInfo(cat_id, FT_DEFAULT));
|
||||
mFetchFolderQueue.emplace_front(FetchQueueInfo(cat_id, FT_DEFAULT));
|
||||
}
|
||||
|
||||
gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
|
||||
|
|
@ -414,13 +414,13 @@ void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id, b
|
|||
if (mForceFetchSet.find(item_id) == mForceFetchSet.end())
|
||||
{
|
||||
mForceFetchSet.insert(item_id);
|
||||
mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_FORCED, false));
|
||||
mFetchItemQueue.emplace_front(FetchQueueInfo(item_id, FT_FORCED, false));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// 'isFinished' being set acts as dupplicate prevention for normal fetches
|
||||
mFetchItemQueue.push_front(FetchQueueInfo(item_id, FT_DEFAULT, false));
|
||||
mFetchItemQueue.emplace_front(FetchQueueInfo(item_id, FT_DEFAULT, false));
|
||||
}
|
||||
|
||||
gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, NULL);
|
||||
|
|
|
|||
Loading…
Reference in New Issue