Merge branch 'avination' into careminster

Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
2026-08-05 17:05:55 +08:00 · 2012-06-11 16:56:40 +01:00
parent 82753d8673 853449d5bc
commit 84377a23db
20 changed files with 25402 additions and 23771 deletions
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -151,5 +151,10 @@ namespace OpenSim.Data.Null
        public void Shutdown()
        {
        }
+
+        public UUID[] GetObjectIDs(UUID regionID)
+        {
+            return new UUID[0];
+        }
    }
 }