diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2023-11-29 22:33:59 +0200 |
|---|---|---|
| committer | akleshchev <117672381+akleshchev@users.noreply.github.com> | 2023-12-06 01:02:42 +0200 |
| commit | 728a91b288c88131db032db687a3e6f0e0a09301 (patch) | |
| tree | ea49203af9699e9c56fbbb00ba9eeef7daa19f8b | |
| parent | 9f3edb90d49bb10fa5608b4d6bdf242c243b0441 (diff) | |
SL-20181 Use back-of compatible fetch
If fetch failed for some reason, old version would cause excessive
rerequests.
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index de987d2dbd..ff92af32ff 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -2284,8 +2284,11 @@ BOOL LLFolderBridge::isItemMovable() const void LLFolderBridge::selectItem() { - // Have no fear: the first thing start() does is to test if everything for that folder has been fetched... - LLInventoryModelBackgroundFetch::instance().start(getUUID(), true); + LLViewerInventoryCategory* cat = gInventory.getCategory(getUUID()); + if (cat) + { + cat->fetch(); + } } void LLFolderBridge::buildDisplayName() const diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 6d5049347f..a976cdc06d 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -664,7 +664,7 @@ bool LLViewerInventoryCategory::fetch(S32 expiry_seconds) } else { - LL_WARNS(LOG_INV) << "agent region is null" << LL_ENDL; + LL_WARNS_ONCE(LOG_INV) << "agent region is null" << LL_ENDL; } if (!url.empty() || AISAPI::isAvailable()) { |