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

indra/llprimitive/llmaterial.cpp

indra/llprimitive/llmaterial.h

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

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

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

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

indra/newview/lldrawpool.h

indra/newview/lldrawpoolmaterials.cpp

indra/newview/lldrawpoolmaterials.h

indra/newview/llmaterialmgr.cpp

indra/newview/llviewerdisplay.cpp

indra/newview/llviewershadermgr.cpp

indra/newview/llviewershadermgr.h

indra/newview/llvovolume.cpp

indra/newview/pipeline.cpp

indra/newview/pipeline.h