A scientist used 1.2 L of water in an experiment. She also used olive oil in the experiment. The amount of olive oil used was 0.49 L less than the amount of water used. What was the combined amount of water and olive oil that the scientist used in the experiment?