merge

indra/llui/llfolderviewitem.cpp

indra/llui/lltabcontainer.cpp

indra/newview/llconversationmodel.cpp

indra/newview/llconversationmodel.h

indra/newview/llconversationview.cpp

indra/newview/llconversationview.h

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/lloutputmonitorctrl.cpp

indra/newview/lloutputmonitorctrl.h

indra/newview/llviewerwindow.cpp

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