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

indra/llrender/llglslshader.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

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

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

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

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

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

...pp_settings/shaders/class3/deferred/fullbrightShinyF.glsl

indra/newview/lldrawpoolalpha.cpp

indra/newview/lldrawpoolbump.cpp

indra/newview/llpanelface.cpp

indra/newview/llviewershadermgr.cpp