The socialite was preparing to fight to have the order made permanent later this month (Dec10), but the case has been resolved outside of court, according to

The website claims Nicole Richie's lawyer Mark Geragos met with Mariotto on Wednesday (01Dec10) and drew up an agreement stating the photographer must stay away from Nicole Richie's family until 2015.

In return, Nicole Richie is reportedly dropping her request for a permanent restraining order.