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/Data/MSSQL/MSSQLSimulationData.cs | |
| 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/Data/MSSQL/MSSQLSimulationData.cs')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLSimulationData.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs index 3f29f5b..47fb6d7 100644 --- a/OpenSim/Data/MSSQL/MSSQLSimulationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLSimulationData.cs | |||
| @@ -2202,5 +2202,10 @@ VALUES | |||
| 2202 | } | 2202 | } |
| 2203 | } | 2203 | } |
| 2204 | } | 2204 | } |
| 2205 | |||
| 2206 | public UUID[] GetObjectIDs(UUID regionID) | ||
| 2207 | { | ||
| 2208 | return new UUID[0]; | ||
| 2209 | } | ||
| 2205 | } | 2210 | } |
| 2206 | } | 2211 | } |