diff --git a/indra/newview/llaisapi.cpp b/indra/newview/llaisapi.cpp index 41684c35c2..897c1455bf 100644 --- a/indra/newview/llaisapi.cpp +++ b/indra/newview/llaisapi.cpp @@ -1378,6 +1378,14 @@ void AISUpdate::parseCategory(const LLSD& category_map, S32 depth) { LL_WARNS() << "Got stale folder, known: " << curr_cat->getVersion() << ", received: " << version << LL_ENDL; + // workaround for rename issue until proper fix is in place + 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; } @@ -1644,7 +1652,7 @@ void AISUpdate::doUpdate() checkTimeout(); // Do version/descendant accounting. - for (std::map::const_iterator catit = mCatDescendentDeltas.begin(); + for (std::map::const_iterator catit = mCatDescendentDeltas.begin(); catit != mCatDescendentDeltas.end(); ++catit) { LL_DEBUGS("Inventory") << "descendant accounting for " << catit->first << LL_ENDL;