Merge from default branch.

indra/llrender/llfontgl.cpp

indra/llui/lltextbase.cpp

indra/newview/app_settings/settings.xml

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llstatusbar.cpp

indra/newview/lltexturefetch.cpp

indra/newview/lltoastimpanel.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp

indra/newview/llweb.cpp

indra/newview/llworldmipmap.cpp

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

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

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