Code review for !42

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));
 };
 

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);
 			}

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>