Automated merge with file:///Users/oz/Work/viewer-development

indra/newview/llcolorswatch.cpp

indra/newview/llcolorswatch.h

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

...wview/skins/default/xui/en/panel_preferences_advanced.xml

...a/newview/skins/default/xui/en/panel_preferences_chat.xml

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

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

...a/newview/skins/default/xui/en/panel_preferences_move.xml

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

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

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