merge

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglslshader.cpp

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/newview/app_settings/logcontrol.xml

indra/newview/app_settings/settings.xml

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

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

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

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

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

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

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

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

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

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

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