Merged DRTVWR-559 into SL-18290

indra/llrender/llcubemaparray.cpp

indra/llrender/llglcommonfunc.cpp

indra/llrender/llrendertarget.cpp

indra/llwindow/llwindowwin32.cpp

...ew/app_settings/shaders/class1/deferred/deferredUtil.glsl

.../app_settings/shaders/class1/environment/underWaterF.glsl

...ew/app_settings/shaders/class1/environment/waterFogF.glsl

...app_settings/shaders/class1/interface/irradianceGenF.glsl

...iew/app_settings/shaders/class1/interface/occlusionF.glsl

...w/app_settings/shaders/class1/interface/radianceGenF.glsl

...app_settings/shaders/class1/interface/reflectionmipF.glsl

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

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

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

.../app_settings/shaders/class3/environment/underWaterF.glsl

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

indra/newview/featuretable.txt

indra/newview/featuretable_mac.txt

indra/newview/lldrawpool.cpp

indra/newview/lldrawpoolalpha.cpp