merge

.hgtags

indra/llcommon/llversionviewer.h

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

indra/llrender/llrender.cpp

indra/llrender/llvertexbuffer.cpp

indra/llrender/llvertexbuffer.h

indra/newview/app_settings/settings.xml

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

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

...ew/app_settings/shaders/class1/deferred/avatarAlphaV.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

indra/newview/llagent.cpp

indra/newview/llagentwearables.cpp

indra/newview/llagentwearablesfetch.cpp

indra/newview/llagentwearablesfetch.h

indra/newview/llappearancemgr.cpp

indra/newview/lldrawable.cpp