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

autobuild.xml

doc/contributions.txt

indra/llcommon/llfoldertype.cpp

indra/llcommon/llfoldertype.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llui/CMakeLists.txt

indra/llui/llaccordionctrltab.cpp

indra/llui/llbadge.cpp

indra/llui/llbadge.h

indra/llui/llbadgeowner.cpp

indra/llui/llbadgeowner.h

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/llui/llloadingindicator.h

indra/llui/llpanel.cpp

indra/llui/llpanel.h

indra/llui/lluictrl.cpp