Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

autobuild.xml

indra/newview/installers/windows/installer_template.nsi

indra/newview/llappviewer.cpp

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

indra/newview/skins/default/xui/de/floater_tos.xml

indra/newview/skins/default/xui/de/mime_types.xml

indra/newview/skins/default/xui/de/notifications.xml

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

indra/newview/skins/default/xui/de/strings.xml

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

indra/newview/skins/default/xui/es/floater_tos.xml

indra/newview/skins/default/xui/es/mime_types.xml

indra/newview/skins/default/xui/es/notifications.xml

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

indra/newview/skins/default/xui/es/strings.xml

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

indra/newview/skins/default/xui/fr/floater_tos.xml

indra/newview/skins/default/xui/fr/mime_types.xml

indra/newview/skins/default/xui/fr/notifications.xml

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