Connor and Mayweather agree terms