Merge from viewer2, including fix for the test failure biting qarl.

indra/llcommon/llfasttimer.h

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llui/llfloater.cpp

indra/llui/llmenugl.cpp

indra/llui/lltexteditor.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

...ewview/installers/darwin/fix_application_icon_position.sh

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llavatarlist.cpp

indra/newview/llavatarlistitem.cpp

indra/newview/llavatarlistitem.h

indra/newview/llbottomtray.cpp

indra/newview/llcallfloater.cpp

indra/newview/llchathistory.cpp

indra/newview/llfloaterabout.cpp

indra/newview/llfloaterchat.cpp