diff options
| author | Melanie | 2012-06-11 16:56:40 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-11 16:56:40 +0100 |
| commit | 84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch) | |
| tree | c22592aaf31bee652924b8016b60d24096d441c5 /OpenSim/Services/Connectors/Simulation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff) | |
| download | opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2 opensim-SC-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Simulation')
| -rw-r--r-- | OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs index c9cbbfa..6db830b 100644 --- a/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs +++ b/OpenSim/Services/Connectors/Simulation/SimulationDataService.cs | |||
| @@ -164,5 +164,9 @@ namespace OpenSim.Services.Connectors | |||
| 164 | m_database.RemoveRegionEnvironmentSettings(regionUUID); | 164 | m_database.RemoveRegionEnvironmentSettings(regionUUID); |
| 165 | } | 165 | } |
| 166 | 166 | ||
| 167 | public UUID[] GetObjectIDs(UUID regionID) | ||
| 168 | { | ||
| 169 | return m_database.GetObjectIDs(regionID); | ||
| 170 | } | ||
| 167 | } | 171 | } |
| 168 | } | 172 | } |