Melanie 90e4c3fece Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MSSQL/MSSQLSimulationData.cs
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/Null/NullSimulationData.cs
	OpenSim/Data/SQLite/SQLiteSimulationData.cs
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs

2012-08-15 18:58:15 +01:00

4.6 KiB

Raw Blame History

View Raw