merge

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/newview/app_settings/settings.xml

...a/newview/app_settings/shaders/class1/avatar/avatarF.glsl

...wview/app_settings/shaders/class1/avatar/avatarSkinV.glsl

...a/newview/app_settings/shaders/class1/avatar/avatarV.glsl

.../newview/app_settings/shaders/class1/avatar/eyeballF.glsl

.../newview/app_settings/shaders/class1/avatar/eyeballV.glsl

...wview/app_settings/shaders/class1/avatar/objectSkinV.glsl

...wview/app_settings/shaders/class1/avatar/pickAvatarF.glsl

...wview/app_settings/shaders/class1/avatar/pickAvatarV.glsl

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

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

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

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

...p_settings/shaders/class1/deferred/attachmentShadowF.glsl