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

indra/llprimitive/lltextureentry.cpp

indra/llrender/llglslshader.cpp

indra/newview/app_settings/settings.xml

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

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

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

...ngs/shaders/class1/deferred/postDeferredGammaCorrect.glsl

...ewview/app_settings/shaders/class1/environment/srgbF.glsl

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

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

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

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

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

...app_settings/shaders/class3/deferred/multiSpotLightF.glsl

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

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

...view/app_settings/shaders/class3/deferred/spotLightF.glsl

indra/newview/llenvironment.cpp

indra/newview/llenvironment.h

indra/newview/llsculptidsize.cpp