merge changes for vmrg-227

indra/llrender/llglslshader.cpp

indra/llrender/llglslshader.h

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/llui/llui.cpp

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

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

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

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

indra/newview/app_settings/shaders/class1/deferred/skyV.glsl

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

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

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

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

...ew/app_settings/shaders/class2/deferred/softenLightF.glsl

.../app_settings/shaders/class2/windlight/atmosphericsV.glsl

...ewview/app_settings/shaders/class2/windlight/cloudsV.glsl

...a/newview/app_settings/shaders/class2/windlight/skyV.glsl

indra/newview/featuretable.txt