Pull merge from lindenlab/viewer-chui

indra/llui/lltoolbar.cpp

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llconversationloglist.cpp

indra/newview/llfloaterconversationlog.cpp

indra/newview/llfloaterconversationlog.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llimview.cpp

indra/newview/lllogchat.cpp

indra/newview/lllogchat.h

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

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