merge

indra/llui/llfolderview.cpp

indra/newview/llconversationlog.cpp

indra/newview/llconversationlog.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llimview.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llnotificationscripthandler.cpp

indra/newview/lltoastnotifypanel.cpp

indra/newview/lltoastpanel.cpp

indra/newview/llviewermessage.cpp

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