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

indra/newview/app_settings/settings.xml

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llviewermedia.cpp

indra/newview/llviewerparcelmedia.cpp

indra/newview/llviewertexture.cpp

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

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