summaryrefslogtreecommitdiff
path: root/indra/newview/rlvhandler.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-07-23 21:07:10 +0800
committerErik Kundiman <erik@megapahit.org>2025-07-23 21:07:10 +0800
commitf0f3169e8ea14219ae179efdebf87a395ae5a029 (patch)
treed4f2e27a267a0543c5a99ee6daa12a705a230e1e /indra/newview/rlvhandler.cpp
parentc6fad73657aaa07e439aab94f6349a173c06e1de (diff)
RLV shared folder needs to be directly under root
Diffstat (limited to 'indra/newview/rlvhandler.cpp')
-rw-r--r--indra/newview/rlvhandler.cpp7
1 files changed, 5 insertions, 2 deletions
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;