merge

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglslshader.cpp

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llrendersphere.cpp

indra/llrender/llrendersphere.h

indra/llrender/llshadermgr.cpp

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/objectSkinV.glsl

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

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

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

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