Automated merge with ssh://rick@hg.lindenlab.com/rick/viewer-2-0-rickcallum

indra/newview/llviewermessage.cpp

...ewview/skins/default/xui/en/floater_preview_animation.xml

indra/newview/skins/default/xui/en/floater_preview_sound.xml

indra/newview/skins/default/xui/en/menu_inventory.xml

indra/newview/skins/default/xui/en/panel_navigation_bar.xml

...ewview/skins/default/xui/en/panel_preferences_general.xml

indra/newview/skins/default/xui/en/sidepanel_task_info.xml

indra/newview/skins/default/xui/en/widgets/filter_editor.xml