Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge

indra/llcommon/llavatarname.cpp

indra/llrender/llfontgl.cpp

indra/llui/llfloater.cpp

indra/llui/llmenugl.cpp

indra/llui/llnotifications.cpp

indra/llui/llscrolllistcell.cpp

indra/llui/lluistring.cpp

indra/llxml/llxmlnode.cpp

indra/llxuixml/llinitparam.h

indra/newview/app_settings/settings.xml

indra/newview/llagentwearables.cpp

indra/newview/llfilepicker.cpp

indra/newview/llfloaterbuildoptions.cpp

indra/newview/llfloaterbuildoptions.h

indra/newview/llfloatermediasettings.cpp

indra/newview/llfloatermediasettings.h

indra/newview/llfloatertools.cpp

indra/newview/llfloatertools.h

indra/newview/llfloatertranslationsettings.cpp

indra/newview/llfolderviewitem.cpp