Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

indra/newview/llappearancemgr.h

indra/newview/llfavoritesbar.cpp

indra/newview/llfloaterbulkpermission.cpp

indra/newview/llfloaterbulkpermission.h

indra/newview/llfolderviewitem.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventoryfilter.cpp

indra/newview/llinventoryfunctions.cpp

indra/newview/llinventorymodel.cpp

indra/newview/llpanelcontents.cpp

indra/newview/llpanelgroupnotices.cpp

indra/newview/llpanellandmarkinfo.cpp

indra/newview/llpanelteleporthistory.cpp

indra/newview/llsidepanelinventorysubpanel.cpp

indra/newview/lltoastgroupnotifypanel.cpp

indra/newview/llviewerinventory.cpp

indra/newview/llviewerinventory.h

indra/newview/llviewermessage.cpp

indra/newview/llwearablelist.cpp