Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl)

indra/newview/llinventorymodel.h

@@ -34,6 +34,7 @@
 #define LL_LLINVENTORYMODEL_H
 
 #include "llassettype.h"
+#include "llfoldertype.h"
 #include "lldarray.h"
 #include "lluuid.h"
 #include "llpermissionsflags.h"
@@ -243,7 +244,7 @@ public:
 	//    NOTE: If create_folder is true, this will create a new inventory category 
 	//    on the fly if one does not exist. *NOTE: if find_in_library is true it 
 	//    will search in the user's library folder instead of "My Inventory"
-	const LLUUID findCategoryUUIDForType(LLAssetType::EType preferred_type, 
+	const LLUUID findCategoryUUIDForType(LLFolderType::EType preferred_type, 
 										 bool create_folder = true 
 										 /*,bool find_in_library = false*/);
 	
@@ -372,7 +373,7 @@ public:
 	// Returns the UUID of the new category. If you want to use the default 
 	// name based on type, pass in a NULL to the 'name' parameter.
 	LLUUID createNewCategory(const LLUUID& parent_id,
-							 LLAssetType::EType preferred_type,
+							 LLFolderType::EType preferred_type,
 							 const std::string& name);
 							 
 	// Internal methods that add inventory and make sure that all of
@@ -492,7 +493,7 @@ protected:
 
 	// Internal method which looks for a category with the specified
 	// preferred type. Returns LLUUID::null if not found
- 	LLUUID findCatUUID(LLAssetType::EType preferred_type);
+ 	LLUUID findCatUUID(LLFolderType::EType preferred_type);
 
 	// Empty the entire contents