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

indra/llcommon/llapr.cpp

indra/llprimitive/lltextureentry.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

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

...pp_settings/shaders/class1/deferred/alphaNonIndexedF.glsl

...ings/shaders/class1/deferred/alphaNonIndexedNoColorF.glsl

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

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

...settings/shaders/class1/deferred/avatarAlphaNoColorV.glsl

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

...view/app_settings/shaders/class1/deferred/blurLightF.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