Developer, Pasadena settle monument dispute