Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into cronchy

indra/llprimitive/llprimitive.cpp

indra/llprimitive/lltextureentry.cpp

indra/llprimitive/lltextureentry.h

indra/llrender/llshadermgr.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

...iew/app_settings/shaders/class1/deferred/fullbrightF.glsl

indra/newview/app_settings/shaders/class1/deferred/skyV.glsl

.../newview/app_settings/shaders/class2/deferred/alphaF.glsl

...wview/app_settings/shaders/class2/deferred/pbralphaF.glsl

...app_settings/shaders/class2/interface/irradianceGenF.glsl

.../app_settings/shaders/class2/windlight/atmosphericsF.glsl

..._settings/shaders/class2/windlight/atmosphericsFuncs.glsl

...iew/app_settings/shaders/class2/windlight/transportF.glsl

...pp_settings/shaders/class3/deferred/fullbrightShinyF.glsl

...wview/app_settings/shaders/class3/deferred/materialF.glsl

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

...wview/app_settings/shaders/class3/environment/waterF.glsl

indra/newview/llappviewer.cpp

indra/newview/llfetchedgltfmaterial.cpp