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

autobuild.xml

indra/llprimitive/llmaterial.cpp

indra/llprimitive/llmaterial.h

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

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

...ewview/app_settings/shaders/class1/deferred/diffuseF.glsl

...app_settings/shaders/class1/deferred/diffuseIndexedF.glsl

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

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

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

..._settings/shaders/class1/deferred/postDeferredNoDoFF.glsl

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

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

...gs/shaders/class1/lighting/lightFullbrightAlphaMaskF.glsl

.../newview/app_settings/shaders/class2/deferred/alphaF.glsl

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl

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

...view/app_settings/shaders/class2/deferred/spotLightF.glsl

..._settings/shaders/class2/windlight/atmosphericsVarsF.glsl

..._settings/shaders/class2/windlight/atmosphericsVarsV.glsl