From 877e18951ee37e2f6bc89f0da71d7938ea2a35a1 Mon Sep 17 00:00:00 2001 From: Beq Date: Thu, 7 Dec 2023 21:31:31 +0000 Subject: [PATCH] FIRE-33337/BUG-234770 - Avoid rename issue caused by AIS version mismatch This is a workaround to a wider problem, but the workaround is valid even when the current cause (too many calls to accountForUpdate) is fixed --- indra/newview/llaisapi.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 9fe863cd27..c281accf59 100644 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -1395,6 +1395,15 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth) { LL_WARNS() << "Got stale folder, known: " << curr_cat->getVersion() << ", received: " << version << LL_ENDL; + // FIRE-33337 workaround for rename issue until proper fix is in place and tested + // Also servers a general handler for version de-sync bugs in the future. + if( version < curr_cat->getVersion() ) + { + // AIS version is considered canonical, so we need to refetch + curr_cat->setVersion(LLViewerInventoryCategory::VERSION_UNKNOWN); + curr_cat->fetch(); + } + // return; }