Merge branch 'DRTVWR-440' of https://bitbucket.org/lindenlab/viewer

indra/llrender/llrender.cpp

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

...pp_settings/shaders/class1/deferred/fullbrightShinyF.glsl

...pp_settings/shaders/class1/deferred/fullbrightShinyV.glsl

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

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

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

...pp_settings/shaders/class1/environment/terrainWaterF.glsl

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

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

.../app_settings/shaders/class2/windlight/atmosphericsV.glsl

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

indra/newview/llface.cpp

indra/newview/llviewershadermgr.cpp