merge changes for DRTVWR-305

.hgtags

indra/llui/llscrolllistctrl.cpp

indra/llui/llscrolllistctrl.h

indra/llui/lltextbase.cpp

indra/newview/app_settings/settings_per_account.xml

indra/newview/llchiclet.cpp

indra/newview/lldonotdisturbnotificationstorage.cpp

indra/newview/llfloaterimcontainer.cpp

indra/newview/llfloaterimcontainer.h

indra/newview/llfloaterimnearbychat.cpp

indra/newview/llfloaterimnearbychathandler.cpp

indra/newview/llfloaterimsession.cpp

indra/newview/llfloaterimsessiontab.cpp

indra/newview/llfloaterimsessiontab.h

indra/newview/llimview.cpp

indra/newview/llnotificationstorage.cpp

indra/newview/llpersistentnotificationstorage.cpp

indra/newview/llvoavatar.cpp

indra/newview/llvoavatar.h

indra/newview/llvoicevivox.cpp