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

indra/llrender/llfontgl.cpp

indra/llui/lltextbase.cpp

indra/llui/lltooltip.cpp

indra/newview/llviewermedia.cpp

indra/newview/skins/default/xui/en/floater_aaa.xml

indra/newview/skins/default/xui/en/floater_about_land.xml

.../newview/skins/default/xui/en/floater_merchant_outbox.xml

indra/newview/skins/default/xui/en/floater_model_preview.xml

...ns/default/xui/en/floater_test_text_vertical_aligment.xml

indra/newview/skins/default/xui/en/floater_toybox.xml

indra/newview/skins/default/xui/en/panel_chat_header.xml

indra/newview/skins/default/xui/en/panel_chat_item.xml

indra/newview/skins/default/xui/en/widgets/tab_container.xml