Merge remote-tracking branch...

Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q

doc/contributions.txt

@@ -282,6 +282,7 @@ Beq Janus
 	SL-11300
 	SL-15709
 	SL-16021
+	SL-18592
 Beth Walcher
 Bezilon Kasei
 Biancaluce Robbiani

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

@@ -227,7 +227,7 @@ void main()
     vec4 diffcol = texture2D(diffuseMap, vary_texcoord0.xy);
 	diffcol.rgb *= vertex_color.rgb;
 
-#ifdef HAS_ALPHA_MASK
+#if HAS_ALPHA_MASK && (DIFFUSE_ALPHA_MODE != DIFFUSE_ALPHA_MODE_EMISSIVE)
 #if DIFFUSE_ALPHA_MODE == DIFFUSE_ALPHA_MODE_BLEND
     if (diffcol.a*vertex_color.a < minimum_alpha)
 #else