merge viewer-development -> mesh-development

.hgtags

autobuild.xml

doc/contributions.txt

indra/llcharacter/llcharacter.cpp

indra/llcharacter/llcharacter.h

indra/llcharacter/llkeyframemotion.cpp

indra/llcharacter/llkeyframemotion.h

indra/llmessage/lliosocket.cpp

indra/llmessage/lliosocket.h

indra/llrender/llgl.cpp

indra/llrender/llglslshader.cpp

indra/llrender/llshadermgr.cpp

indra/llui/llconsole.cpp

indra/newview/app_settings/settings.xml

indra/newview/featuretable.txt

indra/newview/featuretable_xp.txt

indra/newview/llavataractions.cpp

indra/newview/llbottomtray.cpp

indra/newview/lldebugview.cpp

indra/newview/llfloaterauction.cpp