So sick of these EEP warnings in my log, add the asset types

indra/llcommon/llassettype.cpp

@@ -101,6 +101,9 @@ LLAssetDictionary::LLAssetDictionary()
 	addEntry(LLAssetType::AT_OUTFIT,			new AssetEntry("OUTFIT",			"outfit", 	"outfit",			false,		false,		false));
 	addEntry(LLAssetType::AT_MY_OUTFITS,		new AssetEntry("MY_OUTFITS",		"my_otfts",	"my outfits",		false,		false,		false));
 	addEntry(LLAssetType::AT_MESH,		        new AssetEntry("MESH",		        "mesh",	    "mesh",		        false,		true,		true));
+	addEntry(LLAssetType::AT_SETTINGS,	        new AssetEntry("SETTINGS",			"settings",	"settings blob",	true,		true,		true));
+
+	addEntry(LLAssetType::AT_UNKNOWN, 			new AssetEntry("UNKNOWN",			"invalid",	NULL,		  		false,		false,		false));
 	addEntry(LLAssetType::AT_NONE, 				new AssetEntry("NONE",				"-1",		NULL,		  		false,		false,		false));
 };		
 

indra/llcommon/llassettype.h

@@ -132,7 +132,16 @@ public:
 		AT_MESH = 49,
 			// Mesh data in our proprietary SLM format
 		
-		AT_COUNT = 50,
+		AT_RESERVED_1 = 50,
+		AT_RESERVED_2 = 51,
+		AT_RESERVED_3 = 52,
+		AT_RESERVED_4 = 53,
+		AT_RESERVED_5 = 54,
+		AT_RESERVED_6 = 55,
+
+		AT_SETTINGS = 56,   // Collection of settings
+
+		AT_COUNT = 57,
 
 			// +*********************************************************+
 			// |  TO ADD AN ELEMENT TO THIS ENUM:                        |
@@ -143,7 +152,7 @@ public:
 			// | 4. ADD TO LLViewerAssetType.cpp                         |
 			// | 5. ADD TO DEFAULT_ASSET_FOR_INV in LLInventoryType.cpp  |
 			// +*********************************************************+
-
+		AT_UNKNOWN = 255,
 		AT_NONE = -1
 	};
 

indra/llinventory/llinventorytype.cpp

@@ -85,6 +85,7 @@ LLInventoryDictionary::LLInventoryDictionary()
 	addEntry(LLInventoryType::IT_ANIMATION,           new InventoryEntry("animation", "animation",     1, LLAssetType::AT_ANIMATION));  
 	addEntry(LLInventoryType::IT_GESTURE,             new InventoryEntry("gesture",   "gesture",       1, LLAssetType::AT_GESTURE)); 
 	addEntry(LLInventoryType::IT_MESH,                new InventoryEntry("mesh",      "mesh",          1, LLAssetType::AT_MESH));
+	addEntry(LLInventoryType::IT_SETTINGS,            new InventoryEntry("settings",  "settings",      1, LLAssetType::AT_SETTINGS));
 }
 
 
@@ -145,6 +146,15 @@ DEFAULT_ASSET_FOR_INV_TYPE[LLAssetType::AT_COUNT] =
 	LLInventoryType::IT_NONE,			// 47	AT_NONE
 	LLInventoryType::IT_NONE,			// 48	AT_NONE
 	LLInventoryType::IT_MESH,			// 49	AT_MESH
+
+	LLInventoryType::IT_NONE,			// 50	AT_RESERVED_1
+	LLInventoryType::IT_NONE,			// 52	AT_RESERVED_2
+	LLInventoryType::IT_NONE,			// 53	AT_RESERVED_3
+	LLInventoryType::IT_NONE,			// 54	AT_RESERVED_4
+	LLInventoryType::IT_NONE,			// 55	AT_RESERVED_5
+	LLInventoryType::IT_NONE,			// 56	AT_RESERVED_6
+
+	LLInventoryType::IT_SETTINGS,			// 57	AT_SETTINGS
 };
 
 // static

indra/llinventory/llinventorytype.h

@@ -62,8 +62,10 @@ public:
 		IT_ANIMATION = 19,
 		IT_GESTURE = 20,
 		IT_MESH = 22,
-		IT_COUNT = 23,
+		IT_SETTINGS = 25,
+		IT_COUNT = 26,
 
+		IT_UNKNOWN = 255,
 		IT_NONE = -1
 	};
 
@@ -108,8 +110,14 @@ public:
 		ICONNAME_LINKFOLDER,
 		ICONNAME_MESH,
 
+		ICONNAME_SETTINGS,
+		ICONNAME_SETTINGS_SKY,
+		ICONNAME_SETTINGS_WATER,
+		ICONNAME_SETTINGS_DAY,
+
 		ICONNAME_CLOTHING_UNKNOWN,
 		ICONNAME_INVALID,
+		ICONNAME_UNKNOWN,
 		ICONNAME_COUNT,
 		ICONNAME_NONE = -1
 	};

indra/newview/llinventorybridge.cpp

@@ -1296,6 +1296,9 @@ LLInvFVBridge* LLInvFVBridge::createBridge(LLAssetType::EType asset_type,
 			//LL_WARNS() << LLAssetType::lookup(asset_type) << " asset type is unhandled for uuid " << uuid << LL_ENDL;
 			break;
 
+		case LLAssetType::AT_SETTINGS:
+			break;
+
 		default:
 			LL_INFOS() << "Unhandled asset type (llassetstorage.h): "
 					<< (S32)asset_type << " (" << LLAssetType::lookup(asset_type) << ")" << LL_ENDL;

indra/newview/llinventoryicon.cpp

@@ -88,8 +88,14 @@ LLIconDictionary::LLIconDictionary()
 	addEntry(LLInventoryType::ICONNAME_LINKFOLDER, 				new IconEntry("inv_link_folder.tga"));
 	addEntry(LLInventoryType::ICONNAME_MESH,	 				new IconEntry("inv_item_mesh.tga"));
 
+	addEntry(LLInventoryType::ICONNAME_SETTINGS_SKY,	new IconEntry("Inv_SettingsSky.png"));
+	addEntry(LLInventoryType::ICONNAME_SETTINGS_WATER,	new IconEntry("Inv_SettingsWater.png"));
+	addEntry(LLInventoryType::ICONNAME_SETTINGS_DAY,	new IconEntry("Inv_SettingsDay.png"));
+	addEntry(LLInventoryType::ICONNAME_SETTINGS,		new IconEntry("Inv_Settings.png"));
+
 	addEntry(LLInventoryType::ICONNAME_CLOTHING_UNKNOWN, 		new IconEntry("inv_item_unknown.tga"));
 	addEntry(LLInventoryType::ICONNAME_INVALID, 				new IconEntry("inv_invalid.png"));
+	addEntry(LLInventoryType::ICONNAME_UNKNOWN, 				new IconEntry("Inv_UnknownObject.png"));
 
 	addEntry(LLInventoryType::ICONNAME_NONE, 					new IconEntry("NONE"));
 }
@@ -163,6 +169,14 @@ const std::string& LLInventoryIcon::getIconName(LLAssetType::EType asset_type,
 			break;
 		case LLAssetType::AT_MESH:
 			idx = LLInventoryType::ICONNAME_MESH;
+			break;
+		case LLAssetType::AT_SETTINGS:
+			// TODO: distinguish between Sky and Water settings.
+			idx = assignSettingsIcon(misc_flag);
+			break;
+		case LLAssetType::AT_UNKNOWN:
+			idx = LLInventoryType::ICONNAME_UNKNOWN;
+			break;
 		default:
 			break;
 	}
@@ -182,3 +196,14 @@ LLInventoryType::EIconName LLInventoryIcon::assignWearableIcon(U32 misc_flag)
 	const LLWearableType::EType wearable_type = LLWearableType::EType(LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK & misc_flag);
 	return LLWearableType::getIconName(wearable_type);
 }
+
+LLInventoryType::EIconName LLInventoryIcon::assignSettingsIcon(U32 misc_flag)
+{
+	switch (misc_flag & LLInventoryItemFlags::II_FLAGS_WEARABLES_MASK)
+	{
+		case 0: return LLInventoryType::ICONNAME_SETTINGS_SKY;
+		case 1: return LLInventoryType::ICONNAME_SETTINGS_WATER;
+		case 2: return LLInventoryType::ICONNAME_SETTINGS_DAY;
+	}
+	return LLInventoryType::ICONNAME_SETTINGS;
+}

indra/newview/llinventoryicon.h

@@ -49,6 +49,7 @@ public:
 
 protected:
 	static LLInventoryType::EIconName assignWearableIcon(U32 misc_flag);
+	static LLInventoryType::EIconName assignSettingsIcon(U32 misc_flag);
 };
 #endif // LL_LLINVENTORYICON_H
 

indra/newview/llviewerassetstats.cpp

@@ -524,88 +524,31 @@ asset_type_to_category(const LLViewerAssetType::EType at, bool with_http, bool i
 	//  - gestures
 	//  - everything else.
 	//
-	llassert_always(50 == LLViewerAssetType::AT_COUNT);
 
 	// Multiple asset definitions are floating around so this requires some
 	// maintenance and attention.
-	static const LLViewerAssetStats::EViewerAssetCategories asset_to_bin_map[LLViewerAssetType::AT_COUNT] =
-		{
-			LLViewerAssetStats::EVACTextureTempHTTPGet,			// (0) AT_TEXTURE
-			LLViewerAssetStats::EVACSoundUDPGet,				// AT_SOUND
-			LLViewerAssetStats::EVACOtherGet,					// AT_CALLINGCARD
-			LLViewerAssetStats::EVACOtherGet,					// AT_LANDMARK
-			LLViewerAssetStats::EVACOtherGet,					// AT_SCRIPT
-			LLViewerAssetStats::EVACWearableUDPGet,				// AT_CLOTHING
-			LLViewerAssetStats::EVACOtherGet,					// AT_OBJECT
-			LLViewerAssetStats::EVACOtherGet,					// AT_NOTECARD
-			LLViewerAssetStats::EVACOtherGet,					// AT_CATEGORY
-			LLViewerAssetStats::EVACOtherGet,					// AT_ROOT_CATEGORY
-			LLViewerAssetStats::EVACOtherGet,					// (10) AT_LSL_TEXT
-			LLViewerAssetStats::EVACOtherGet,					// AT_LSL_BYTECODE
-			LLViewerAssetStats::EVACOtherGet,					// AT_TEXTURE_TGA
-			LLViewerAssetStats::EVACWearableUDPGet,				// AT_BODYPART
-			LLViewerAssetStats::EVACOtherGet,					// AT_TRASH
-			LLViewerAssetStats::EVACOtherGet,					// AT_SNAPSHOT_CATEGORY
-			LLViewerAssetStats::EVACOtherGet,					// AT_LOST_AND_FOUND
-			LLViewerAssetStats::EVACSoundUDPGet,				// AT_SOUND_WAV
-			LLViewerAssetStats::EVACOtherGet,					// AT_IMAGE_TGA
-			LLViewerAssetStats::EVACOtherGet,					// AT_IMAGE_JPEG
-			LLViewerAssetStats::EVACGestureUDPGet,				// (20) AT_ANIMATION
-			LLViewerAssetStats::EVACGestureUDPGet,				// AT_GESTURE
-			LLViewerAssetStats::EVACOtherGet,					// AT_SIMSTATE
-			LLViewerAssetStats::EVACOtherGet,					// AT_FAVORITE
-			LLViewerAssetStats::EVACOtherGet,					// AT_LINK
-			LLViewerAssetStats::EVACOtherGet,					// AT_LINK_FOLDER
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// (30)
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// (40)
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					//
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// 
-			LLViewerAssetStats::EVACOtherGet,					// AT_MESH
-																// (50)
-		};
-	
-	if (at < 0 || at >= LLViewerAssetType::AT_COUNT)
+	switch (at)
 	{
+	case LLAssetType::AT_TEXTURE:
+		return is_temp ? with_http ? LLViewerAssetStats::EVACTextureTempHTTPGet : LLViewerAssetStats::EVACTextureTempUDPGet
+			: with_http ? LLViewerAssetStats::EVACTextureTempHTTPGet : LLViewerAssetStats::EVACTextureNonTempUDPGet;
+		break;
+	case LLAssetType::AT_SOUND:
+	case LLAssetType::AT_SOUND_WAV:
+		return LLViewerAssetStats::EVACSoundUDPGet;
+		break;
+	case LLAssetType::AT_CLOTHING:
+	case LLAssetType::AT_BODYPART:
+		return LLViewerAssetStats::EVACWearableUDPGet;
+		break;
+	case LLAssetType::AT_ANIMATION:
+	case LLAssetType::AT_GESTURE:
+		return LLViewerAssetStats::EVACGestureUDPGet;
+		break;
+	case LLAssetType::AT_LANDMARK:
+	default:
 		return LLViewerAssetStats::EVACOtherGet;
+		break;
 	}
-	LLViewerAssetStats::EViewerAssetCategories ret(asset_to_bin_map[at]);
-	if (LLViewerAssetStats::EVACTextureTempHTTPGet == ret)
-	{
-		// Indexed with [is_temp][with_http]
-		static const LLViewerAssetStats::EViewerAssetCategories texture_bin_map[2][2] =
-			{
-				{
-					LLViewerAssetStats::EVACTextureNonTempUDPGet,
-					LLViewerAssetStats::EVACTextureNonTempHTTPGet,
-				},
-				{
-					LLViewerAssetStats::EVACTextureTempUDPGet,
-					LLViewerAssetStats::EVACTextureTempHTTPGet,
-				}
-			};
-
-		ret = texture_bin_map[is_temp][with_http];
-	}
-	return ret;
 }
-
 } // anonymous namespace

indra/newview/llviewerassettype.cpp

@@ -88,7 +88,10 @@ LLViewerAssetDictionary::LLViewerAssetDictionary()
 
 	addEntry(LLViewerAssetType::AT_MESH, 				new ViewerAssetEntry(DAD_MESH));
 
+	addEntry(LLViewerAssetType::AT_UNKNOWN,				new ViewerAssetEntry(DAD_NONE));
+
 	addEntry(LLViewerAssetType::AT_NONE, 				new ViewerAssetEntry(DAD_NONE));
+	addEntry(LLViewerAssetType::AT_SETTINGS,			new ViewerAssetEntry(DAD_NONE));
 };
 
 EDragAndDropType LLViewerAssetType::lookupDragAndDropType(EType asset_type)

indra/newview/skins/default/textures/textures.xml

@@ -149,6 +149,11 @@ with the same filename but different name
   <!-- Images that have since been renamed to something else in v3 and need updating. Alphabetical. -->
   <texture name="Flag.png" file_name="Flag.png" preload="false" />
   <texture name="Inv_Post_Process.png" preload="true"/>
+  <texture name="Inv_Settings" file_name="Inv_Settings.png" preload="false" />
+  <texture name="Inv_SettingsSky" file_name="Inv_SettingsSky.png" preload="false" />
+  <texture name="Inv_SettingsWater" file_name="Inv_SettingsWater.png" preload="false" />
+  <texture name="Inv_SettingsDay" file_name="Inv_SettingsDay.png" preload="false" />
+  <texture name="Inv_Unknown" file_name="Inv_UnknownObject.png" preload="false" />
   <texture name="Inv_WaterLight.png" preload="true"/>
   <texture name="Inv_WindLight.png" preload="true"/>
   <texture name="Parcel_Exp_Color.png" file_name="Parcel_Exp_Color.png" preload="false" />