Commit 13821018 authored by Xenny Heartsong's avatar Xenny Heartsong Committed by Rye Mutt
Browse files

Elevate #RLV back to being a system folder

parent 3efe88a1
......@@ -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));
};
......
......@@ -97,6 +97,7 @@ class LLFolderType
FT_ANIM_OVERRIDES,
FT_TOXIC,
FT_RLV,
FT_COUNT,
......
......@@ -3517,6 +3517,8 @@ LLFolderType::EType LLFolderBridge::getPreferredType() const
else if (cat_name == "#Firestorm" || cat_name == "#Phoenix"
|| cat_name == "#DV3" || cat_name == "#Kokua")
preferred_type = LLFolderType::FT_TOXIC;
else if (cat_name == RLV_ROOT_FOLDER)
preferred_type = LLFolderType::FT_RLV;
else
preferred_type = cat->getPreferredType();
}
......
......@@ -149,6 +149,7 @@ LLViewerFolderDictionary::LLViewerFolderDictionary()
addEntry(LLFolderType::FT_NONE, new ViewerFolderEntry("New Folder", "Inv_FolderOpen", "Inv_FolderClosed", FALSE, false, "default"));
addEntry(LLFolderType::FT_TOXIC, new ViewerFolderEntry("Firstorm", "Inv_FolderOpenToxic", "Inv_FolderClosedToxic", FALSE, false));
addEntry(LLFolderType::FT_RLV, new ViewerFolderEntry("RlvRoot", "Inv_SysOpen", "Inv_SysClosed", FALSE, false));
for (U32 type = (U32)LLFolderType::FT_ENSEMBLE_START; type <= (U32)LLFolderType::FT_ENSEMBLE_END; ++type)
{
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment