Pull and merge latest viewer-beta

.hgtags

indra/llrender/llgl.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltoolbar.cpp

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_per_account.xml

indra/newview/llchiclet.cpp

indra/newview/llconversationlog.cpp

indra/newview/llconversationloglist.cpp

indra/newview/llconversationmodel.cpp

indra/newview/lldelayedgestureerror.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/llfloaterpreference.cpp