merge changes for storm-1118

.hgtags

BuildParams

doc/contributions.txt

indra/llplugin/llpluginclassmedia.cpp

indra/llplugin/llpluginclassmedia.h

indra/llplugin/llpluginclassmediaowner.h

indra/llui/lliconctrl.h

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llmenugl.cpp

indra/llwindow/llwindowwin32.cpp

indra/media_plugins/webkit/media_plugin_webkit.cpp

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_minimal.xml

indra/newview/llagentlistener.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llappviewerlinux.cpp

indra/newview/llappviewermacosx.cpp

indra/newview/llavataractions.cpp