Merge branch 'DRTVWR-559' into DRTVWR-583-glossy-ssr

indra/llinventory/llsettingsbase.cpp

indra/llinventory/llsettingsbase.h

indra/llinventory/llsettingssky.cpp

indra/llinventory/llsettingssky.h

indra/llrender/llgltexture.cpp

indra/llrender/llgltexture.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/newview/app_settings/settings.xml

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

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

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

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

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

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

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

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

...view/app_settings/shaders/class1/lighting/sumLightsV.glsl

.../app_settings/shaders/class1/windlight/atmosphericsF.glsl

..._settings/shaders/class1/windlight/atmosphericsFuncs.glsl