Merge remote-tracking branch 'remotes/origin/DRTVWR-559' into DRTVWR-596

indra/llinventory/llinventory.cpp

indra/llprimitive/llgltfmaterial.cpp

indra/llprimitive/llgltfmaterial.h

indra/newview/llfetchedgltfmaterial.cpp

indra/newview/llfetchedgltfmaterial.h

indra/newview/llfloaterchangeitemthumbnail.cpp

indra/newview/llinventorymodel.cpp

indra/newview/lllocalbitmaps.cpp

indra/newview/lllocalbitmaps.h

indra/newview/lllocalgltfmaterials.cpp

indra/newview/lllocalgltfmaterials.h

indra/newview/llmaterialeditor.cpp

indra/newview/llmaterialeditor.h

indra/newview/llpanelprofile.cpp

indra/newview/lltexturectrl.cpp

indra/newview/lltexturectrl.h

indra/newview/llviewerobject.cpp