Merge from default branch

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llsidepaneltaskinfo.cpp

indra/newview/llsidepaneltaskinfo.h

indra/newview/llviewermedia.cpp

indra/newview/llvoavatarself.cpp

indra/newview/skins/default/colors.xml

indra/newview/skins/default/xui/de/floater_bulk_perms.xml

indra/newview/skins/default/xui/de/floater_buy_currency.xml

indra/newview/skins/default/xui/de/floater_customize.xml

indra/newview/skins/default/xui/de/floater_im_session.xml

indra/newview/skins/default/xui/de/floater_pay.xml

indra/newview/skins/default/xui/de/floater_pay_object.xml

indra/newview/skins/default/xui/de/floater_tools.xml

indra/newview/skins/default/xui/de/menu_inventory_add.xml

indra/newview/skins/default/xui/de/menu_viewer.xml

indra/newview/skins/default/xui/de/notifications.xml

indra/newview/skins/default/xui/de/panel_group_invite.xml