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

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llvertexbuffer.cpp

...p_settings/shaders/class1/deferred/attachmentShadowV.glsl

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

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

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

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

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

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

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

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

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

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

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

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

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