Merged in MAINT-8803

indra/llappearance/llwearabletype.cpp

indra/llcommon/llassettype.cpp

indra/llcommon/llassettype.h

indra/llinventory/llinventorytype.cpp

indra/llinventory/llinventorytype.h

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llinventoryicon.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llinventorymodel.h

indra/newview/llinventorypanel.cpp

indra/newview/llviewerassettype.cpp

...ewview/skins/default/textures/icons/Inv_UnknownObject.png

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