merge

indra/llcharacter/llcharacter.h

indra/llrender/llgl.cpp

indra/llrender/llgl.h

indra/llrender/llglheaders.h

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llshadermgr.cpp

indra/llrender/llshadermgr.h

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llui.cpp

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

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

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

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

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