Pull merge from lindenlab/viewer-chui

indra/llrender/llfontgl.cpp

indra/llui/lltextbase.cpp

indra/llui/llurlaction.cpp

indra/llui/llurlaction.h

indra/newview/llavataractions.cpp

indra/newview/llchathistory.cpp

indra/newview/llconversationview.cpp

indra/newview/llconversationview.h

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

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

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