Automated merge with http://hg.secondlife.com/viewer-development

autobuild.xml

indra/cmake/00-Common.cmake

indra/llcommon/llpreprocessor.h

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llplugininstance.h

indra/llplugin/llpluginmessagepipe.h

indra/llplugin/llpluginprocessparent.h

indra/llprimitive/llmodel.cpp

indra/llrender/llfontfreetype.cpp

indra/llrender/llvertexbuffer.cpp

indra/llui/llbutton.cpp

indra/llui/llfloater.cpp

indra/llui/llfloater.h

indra/llui/llhandle.h

indra/llui/llmenugl.h

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/llui/lltextparser.cpp