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

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/newview/app_settings/settings.xml

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

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

...pp_settings/shaders/class2/deferred/reflectionProbeF.glsl

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

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

...pp_settings/shaders/class3/deferred/reflectionProbeF.glsl

...settings/shaders/class3/deferred/screenSpaceReflUtil.glsl

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

indra/newview/pipeline.cpp

indra/newview/pipeline.h