Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17602-new-material-upload

indra/llcommon/llassettype.cpp

indra/llinventory/llinventorytype.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

...view/app_settings/shaders/class1/deferred/pbropaqueF.glsl

...ew/app_settings/shaders/class3/deferred/softenLightF.glsl

indra/newview/lldrawpoolpbropaque.cpp

indra/newview/llface.cpp

indra/newview/llinventoryfilter.cpp

indra/newview/llinventoryicon.cpp

indra/newview/llmaterialeditor.cpp

indra/newview/llmaterialeditor.h

indra/newview/llpanelmaininventory.cpp

indra/newview/lltexturectrl.cpp

indra/newview/lltexturectrl.h

indra/newview/llviewershadermgr.cpp

indra/newview/pipeline.cpp

indra/newview/skins/default/textures/icons/Inv_Material.png

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

...ew/skins/default/xui/en/floater_inventory_view_finder.xml