automated merge from trunk

indra/llcommon/llerrorlegacy.h

indra/llcommon/llfasttimer.h

indra/llrender/llimagegl.cpp

indra/llui/llbutton.cpp

indra/llui/llbutton.h

indra/llui/llfloater.cpp

indra/llui/lltabcontainer.cpp

indra/llui/lltabcontainer.h

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llappearancemgr.h

indra/newview/llappviewer.cpp

indra/newview/llavataractions.cpp

indra/newview/llavataractions.h

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llchiclet.cpp