merge

.hgtags

indra/llcommon/indra_constants.h

indra/llrender/llglstates.h

indra/llrender/llrender.cpp

indra/llrender/llrender.h

indra/llrender/llshadermgr.cpp

indra/llrender/llvertexbuffer.cpp

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/newview/app_settings/settings.xml

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

...pp_settings/shaders/class2/deferred/alphaNonIndexedF.glsl

...ings/shaders/class2/deferred/alphaNonIndexedNoColorF.glsl

...wview/app_settings/shaders/class2/deferred/sunLightF.glsl

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

indra/newview/llavatariconctrl.cpp

indra/newview/lldrawable.cpp

indra/newview/lldrawable.h

indra/newview/lldrawpool.cpp

indra/newview/lldrawpoolterrain.cpp