Merge branch 'avination' into careminster

Conflicts:
	OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
	OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
	OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
This commit is contained in:
Melanie
2012-06-11 16:56:40 +01:00
20 changed files with 25402 additions and 23771 deletions

View File

@@ -164,5 +164,9 @@ namespace OpenSim.Services.Connectors
m_database.RemoveRegionEnvironmentSettings(regionUUID);
}
public UUID[] GetObjectIDs(UUID regionID)
{
return m_database.GetObjectIDs(regionID);
}
}
}