merge

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llrender.cpp

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

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

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

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

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

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

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

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

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

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

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

.../newview/app_settings/shaders/class2/lighting/lightF.glsl

...pp_settings/shaders/class2/lighting/lightFullbrightF.glsl

...s/shaders/class2/lighting/lightFullbrightNonIndexedF.glsl

...ttings/shaders/class2/lighting/lightFullbrightShinyF.glsl