Automated merge with https://bitbucket.org/lindenlab/viewer-development-materials

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

...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

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

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

...pp_settings/shaders/class1/lighting/lightFullbrightF.glsl

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

indra/newview/lldrawpool.cpp

indra/newview/lldrawpool.h

indra/newview/lldrawpoolalpha.cpp

indra/newview/lldrawpoolalpha.h

indra/newview/lldrawpoolavatar.cpp

indra/newview/lldrawpoolbump.cpp

indra/newview/lldrawpoolmaterials.cpp

indra/newview/lldrawpoolsimple.cpp

indra/newview/lldrawpoolsimple.h

indra/newview/llface.cpp