merge changes for 3.5.0-beta7

.hgtags

indra/llui/llchatentry.cpp

indra/llui/llchatentry.h

indra/llui/llscrollbar.cpp

indra/llui/llscrollbar.h

indra/llui/llscrollcontainer.cpp

indra/llui/llscrollcontainer.h

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/llui/lltexteditor.cpp

indra/newview/llconversationview.cpp

indra/newview/llfloaterimnearbychathandler.cpp

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/llfloaterpreference.cpp

indra/newview/llimview.cpp

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

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