merge

indra/llui/llchatentry.cpp

indra/llui/llchatentry.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/app_settings/settings.xml

indra/newview/llconversationmodel.cpp

indra/newview/llconversationview.cpp

indra/newview/llfloaterimsession.cpp

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/llimview.cpp

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

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

...a/newview/skins/default/xui/en/panel_preferences_chat.xml