Automated merge with http://hg.secondlife.com/viewer-development

autobuild.xml

indra/llcommon/llstring.cpp

indra/llcommon/tests/llstring_test.cpp

indra/llmath/tests/v3math_test.cpp

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llui/llcombobox.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/app_settings/settings.xml

indra/newview/llappearancemgr.cpp

indra/newview/llfolderview.cpp

indra/newview/llfolderview.h

indra/newview/llmediactrl.cpp

indra/newview/llmediactrl.h

indra/newview/llpanellogin.cpp

indra/newview/llpanellogin.h

indra/newview/llslurl.cpp

indra/newview/llstatusbar.cpp

indra/newview/llstatusbar.h