Merged in graham_linden/viewer-eep-fixes (pull request #179)

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

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

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

indra/newview/app_settings/shaders/class1/deferred/srgb.glsl

.../newview/app_settings/shaders/class1/deferred/waterF.glsl

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

...iew/app_settings/shaders/class1/environment/terrainF.glsl

...iew/app_settings/shaders/class1/environment/terrainV.glsl

...newview/app_settings/shaders/class1/windlight/gammaF.glsl

...iew/app_settings/shaders/class1/windlight/transportF.glsl

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

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

...newview/app_settings/shaders/class2/windlight/gammaF.glsl

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

.../app_settings/shaders/class3/windlight/atmosphericsF.glsl

...iew/app_settings/shaders/class3/windlight/transportF.glsl

indra/newview/llviewershadermgr.cpp