merge

indra/llcommon/lleventdispatcher.h

indra/llrender/llfontgl.cpp

indra/llui/lllayoutstack.cpp

indra/llui/lllayoutstack.h

indra/llui/llnotificationslistener.cpp

indra/llui/lltextbase.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/gpu_table.txt

indra/newview/llavataractions.cpp

indra/newview/llcallfloater.cpp

indra/newview/llcallfloater.h

indra/newview/llgroupactions.cpp

indra/newview/llimfloater.cpp

indra/newview/llimview.cpp

indra/newview/llimview.h

indra/newview/llparticipantlist.cpp

indra/newview/llscreenchannel.cpp

indra/newview/lltexturectrl.cpp

indra/newview/lltexturectrl.h