Inventory mesh type.

Conflicts:

	indra/llcommon/llassettype.cpp
	indra/llcommon/llassettype.h

indra/newview/llinventoryview.cpp

@@ -1541,6 +1541,9 @@ std::string get_item_icon_name(LLAssetType::EType asset_type,
 	case LLAssetType::AT_GESTURE:
 		idx = GESTURE_ICON_NAME;
 		break;
+	case LLAssetType::AT_MESH:
+		idx = MESH_ICON_NAME;
+		break;
 	default:
 		break;
 	}