aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Null
diff options
context:
space:
mode:
authorMelanie2012-06-11 16:56:40 +0100
committerMelanie2012-06-11 16:56:40 +0100
commit84377a23db64c67fc8f673edf4acc0c4a1541d5c (patch)
treec22592aaf31bee652924b8016b60d24096d441c5 /OpenSim/Data/Null
parentMerge branch 'master' into careminster (diff)
parentMake llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGloba... (diff)
downloadopensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.zip
opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.gz
opensim-SC_OLD-84377a23db64c67fc8f673edf4acc0c4a1541d5c.tar.bz2
opensim-SC_OLD-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/Null')
-rw-r--r--OpenSim/Data/Null/NullSimulationData.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index 8f2314f..a39ef0b 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -151,5 +151,10 @@ namespace OpenSim.Data.Null
151 public void Shutdown() 151 public void Shutdown()
152 { 152 {
153 } 153 }
154
155 public UUID[] GetObjectIDs(UUID regionID)
156 {
157 return new UUID[0];
158 }
154 } 159 }
155} 160}