Merge branch 'release/materials_featurette' of...

indra/llmath/llvolume.cpp

indra/llrender/llglslshader.h

indra/llrender/llshadermgr.cpp

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

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

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

...p_settings/shaders/class1/deferred/diffuseAlphaMaskF.glsl

...ngs/shaders/class1/deferred/diffuseAlphaMaskIndexedF.glsl

...ngs/shaders/class1/deferred/diffuseAlphaMaskNoColorF.glsl

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

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

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

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

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

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

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

.../app_settings/shaders/class1/environment/encodeNormF.glsl

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

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

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