slightly-hairy merge from viewer-trunk

indra/llcharacter/llkeyframemotion.cpp

indra/llrender/llimagegl.cpp

indra/llrender/llimagegl.h

indra/llui/llfloater.cpp

indra/llui/llview.cpp

indra/media_plugins/webkit/CMakeLists.txt

indra/media_plugins/webkit/dummy_volume_catcher.cpp

indra/media_plugins/webkit/linux_volume_catcher.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/media_plugins/webkit/volume_catcher.h

indra/newview/app_settings/settings.xml

indra/newview/llappviewer.cpp

indra/newview/lldynamictexture.cpp

indra/newview/lldynamictexture.h

indra/newview/llfloateranimpreview.cpp

indra/newview/llfloateranimpreview.h

indra/newview/llfloaterimagepreview.cpp

indra/newview/llfloaterimagepreview.h

indra/newview/lllogininstance.cpp

indra/newview/llpopupview.cpp