Skip to content
Snippets Groups Projects
Commit f4d594aa authored by Xenhat Hex's avatar Xenhat Hex Committed by Xenny Heartsong
Browse files

Code review for !42

parent da19bbf2
No related branches found
No related tags found
1 merge request!42Elevate #RLV back to being a system folder
This commit is part of merge request !42. Comments created here will be created in the context of that merge request.
...@@ -104,7 +104,9 @@ LLFolderDictionary::LLFolderDictionary() ...@@ -104,7 +104,9 @@ LLFolderDictionary::LLFolderDictionary()
addEntry(LLFolderType::FT_SUITCASE, new FolderEntry("suitcase", TRUE)); addEntry(LLFolderType::FT_SUITCASE, new FolderEntry("suitcase", TRUE));
addEntry(LLFolderType::FT_ANIM_OVERRIDES, new FolderEntry("animover", 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)); addEntry(LLFolderType::FT_NONE, new FolderEntry("-1", FALSE));
}; };
......
...@@ -529,7 +529,7 @@ bool RlvGiveToRLVOffer::createDestinationFolder(const std::string& strPath) ...@@ -529,7 +529,7 @@ bool RlvGiveToRLVOffer::createDestinationFolder(const std::string& strPath)
else else
{ {
inventory_func_type f = boost::bind(RlvGiveToRLVOffer::onCategoryCreateCallback, _1, this); 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()) if (idTemp.notNull())
onCategoryCreateCallback(idTemp, this); onCategoryCreateCallback(idTemp, this);
} }
......
...@@ -3868,6 +3868,8 @@ Abuse Report</string> ...@@ -3868,6 +3868,8 @@ Abuse Report</string>
<string name="Other Gestures">Other Gestures</string> <string name="Other Gestures">Other Gestures</string>
<string name="Speech Gestures">Speech Gestures</string> <string name="Speech Gestures">Speech Gestures</string>
<string name="Common Gestures">Common Gestures</string> <string name="Common Gestures">Common Gestures</string>
<!-- Additional inventory entries -->
<string name="RlvRoot">#RLV</string>
<!-- gestures --> <!-- gestures -->
<string name="Male - Excuse me">Male - Excuse me</string> <string name="Male - Excuse me">Male - Excuse me</string>
<string name="Male - Get lost">Male - Get lost</string> <string name="Male - Get lost">Male - Get lost</string>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment