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

indra/llrender/llshadermgr.cpp

...wview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

...a/newview/app_settings/shaders/class1/avatar/avatarV.glsl

.../newview/app_settings/shaders/class1/avatar/eyeballV.glsl

...wview/app_settings/shaders/class1/avatar/objectSkinV.glsl

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

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

...tings/shaders/class1/deferred/avatarAlphaMaskShadowF.glsl

..._settings/shaders/class1/deferred/avatarAlphaShadowF.glsl

..._settings/shaders/class1/deferred/avatarAlphaShadowV.glsl

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

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

...w/app_settings/shaders/class1/deferred/avatarShadowV.glsl

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

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

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

...a/newview/app_settings/shaders/class1/deferred/bumpF.glsl

...a/newview/app_settings/shaders/class1/deferred/bumpV.glsl

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

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