Automated merge with ssh://rick@hg.lindenlab.com/q/viewer-hotfix/

indra/newview/app_settings/settings.xml

indra/newview/llfloaterpreference.cpp

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

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

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

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

.../newview/skins/default/xui/en/panel_preferences_sound.xml