merging

indra/llrender/llfontgl.cpp

indra/llui/lltextbase.cpp

indra/llui/lltexteditor.cpp

indra/llui/llurlaction.cpp

indra/llui/llurlaction.h

indra/newview/llavataractions.cpp

indra/newview/llchathistory.cpp

indra/newview/llconversationloglist.cpp

indra/newview/llconversationmodel.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/llfloaterpreference.cpp

indra/newview/llimview.cpp

indra/newview/llpanelpeople.cpp

indra/newview/llpanelpeoplemenus.cpp

indra/newview/llpanelpeoplemenus.h

indra/newview/llviewermessage.cpp

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