merge

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

indra/llrender/llshadermgr.cpp

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

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

...pp_settings/shaders/class1/deferred/shadowAlphaMaskF.glsl

...pp_settings/shaders/class1/deferred/shadowAlphaMaskV.glsl

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

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

...app_settings/shaders/class2/lighting/lightAlphaMaskF.glsl

...gs/shaders/class2/lighting/lightAlphaMaskNonIndexedF.glsl

...gs/shaders/class2/lighting/lightFullbrightAlphaMaskF.glsl

.../class2/lighting/lightFullbrightNonIndexedAlphaMaskF.glsl

...aders/class2/lighting/lightFullbrightWaterAlphaMaskF.glsl

...s2/lighting/lightFullbrightWaterNonIndexedAlphaMaskF.glsl

...ettings/shaders/class2/lighting/lightWaterAlphaMaskF.glsl

...aders/class2/lighting/lightWaterAlphaMaskNonIndexedF.glsl

indra/newview/lldrawpoolalpha.cpp