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

indra/llrender/llcubemaparray.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llrender/llrendertarget.cpp

indra/newview/app_settings/settings.xml

...wview/app_settings/shaders/class1/deferred/exposureF.glsl

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

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

...ttings/shaders/class2/windlight/atmosphericsHelpersV.glsl

...pp_settings/shaders/class3/deferred/multiPointLightF.glsl

...iew/app_settings/shaders/class3/deferred/pointLightF.glsl

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

indra/newview/featuretable.txt

indra/newview/featuretable_mac.txt

indra/newview/lldrawpoolbump.cpp

indra/newview/llenvironment.cpp

indra/newview/llreflectionmapmanager.cpp

indra/newview/llreflectionmapmanager.h

indra/newview/llstartup.cpp

indra/newview/llviewermedia.cpp