merge

indra/llrender/llfontgl.cpp

indra/llui/lltextbase.cpp

indra/llui/lltextbase.h

indra/newview/app_settings/settings.xml

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llchiclet.cpp

indra/newview/llimview.cpp

indra/newview/llinventorybridge.cpp

indra/newview/llinventorybridge.h

indra/newview/llnearbychat.cpp

indra/newview/llnearbychathandler.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llstatusbar.cpp

indra/newview/lltexturefetch.cpp

indra/newview/lltoastimpanel.cpp

indra/newview/llviewermenu.cpp

indra/newview/llviewermessage.cpp