From f0f3169e8ea14219ae179efdebf87a395ae5a029 Mon Sep 17 00:00:00 2001
From: Erik Kundiman <erik@megapahit.org>
Date: Wed, 23 Jul 2025 21:07:10 +0800
Subject: RLV shared folder needs to be directly under root

---
 indra/newview/rlvhandler.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/rlvhandler.cpp')

diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 066543987f..18de822512 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -29,6 +29,7 @@
 #include "llagent.h"
 #include "llstartup.h"
 #include "llappearancemgr.h"
+#include "llinventoryfunctions.h"
 #include "llinventorymodel.h"
 #include "llmoveview.h"
 #include "llviewercontrol.h"
@@ -243,9 +244,11 @@ ECmdRet ReplyHandler<EBehaviour::GetSitID>::onCommand(const RlvCommand& rlvCmd,
 template<> template<>
 ECmdRet ReplyHandler<EBehaviour::GetInv>::onCommand(const RlvCommand& rlvCmd, std::string& strReply)
 {
-    auto folderID = findDescendentCategoryIDByName(gInventory.getRootFolderID(), "#RLV");
-    if (folderID == LLUUID::null)
+    auto folderID = gInventory.getRootFolderID();
+    LLNameCategoryCollector has_name("#RLV");
+    if (!gInventory.hasMatchingDirectDescendent(folderID, has_name))
         return ECmdRet::FailedNoSharedRoot;
+    folderID = findDescendentCategoryIDByName(folderID, "#RLV");
     strReply = "";
     LLInventoryModel::cat_array_t* cats;
     LLInventoryModel::item_array_t* items;
-- 
cgit v1.2.3