From f4d594aa28f535b69fe1f088eeb33c0c13da3c82 Mon Sep 17 00:00:00 2001
From: Xenhat Hex <me@xenh.at>
Date: Mon, 6 Sep 2021 16:34:50 -0400
Subject: [PATCH] Code review for !42
---
indra/llinventory/llfoldertype.cpp | 4 +++-
indra/newview/rlvinventory.cpp | 2 +-
indra/newview/skins/default/xui/en/strings.xml | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp
index c41a7a4dc64..5e738a3a347 100644
--- a/indra/llinventory/llfoldertype.cpp
+++ b/indra/llinventory/llfoldertype.cpp
@@ -104,7 +104,9 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_SUITCASE, new FolderEntry("suitcase", TRUE));
addEntry(LLFolderType::FT_ANIM_OVERRIDES, new FolderEntry("animover", TRUE));
-
+
+ addEntry(LLFolderType::FT_RLV, new FolderEntry("rlv", TRUE));
+
addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
};
diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp
index 042f5a17260..5e592f74cff 100644
--- a/indra/newview/rlvinventory.cpp
+++ b/indra/newview/rlvinventory.cpp
@@ -529,7 +529,7 @@ bool RlvGiveToRLVOffer::createDestinationFolder(const std::string& strPath)
else
{
inventory_func_type f = boost::bind(RlvGiveToRLVOffer::onCategoryCreateCallback, _1, this);
- const LLUUID idTemp = gInventory.createNewCategory(gInventory.getRootFolderID(), LLFolderType::FT_RLV, RLV_ROOT_FOLDER, f);
+ const LLUUID idTemp = gInventory.createNewCategory(gInventory.getRootFolderID(), LLFolderType::FT_NONE, RLV_ROOT_FOLDER, f);
if (idTemp.notNull())
onCategoryCreateCallback(idTemp, this);
}
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 634bcd11c42..41cd06ccef3 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3868,6 +3868,8 @@ Abuse Report</string>
<string name="Other Gestures">Other Gestures</string>
<string name="Speech Gestures">Speech Gestures</string>
<string name="Common Gestures">Common Gestures</string>
+ <!-- Additional inventory entries -->
+ <string name="RlvRoot">#RLV</string>
<!-- gestures -->
<string name="Male - Excuse me">Male - Excuse me</string>
<string name="Male - Get lost">Male - Get lost</string>
--
GitLab