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

indra/llmath/llvolume.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrendertarget.cpp

indra/llrender/llrendertarget.h

indra/newview/app_settings/settings.xml

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

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

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

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

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

...pp_settings/shaders/class1/deferred/multiPointLightF.glsl

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl

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

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

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

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

...p_settings/shaders/class1/interface/downsampleDepthF.glsl

...ttings/shaders/class1/interface/downsampleDepthRectF.glsl

...p_settings/shaders/class1/interface/downsampleDepthV.glsl