merge

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/lldockablefloater.cpp

indra/llui/lldockcontrol.cpp

indra/llui/lldockcontrol.h

indra/llui/llflatlistview.cpp

indra/llui/llflatlistview.h

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/newview/app_settings/foldertypes.xml

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llagentwearables.h

indra/newview/llappearancemgr.cpp

indra/newview/llavatarlist.cpp

indra/newview/llavatarlist.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llavatarpropertiesprocessor.cpp

indra/newview/llavatarpropertiesprocessor.h