Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge

1 files changed, 4 insertions, 2 deletions

diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index c33a6f2..b788976 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -77,8 +77,10 @@ namespace OpenSim.Data.Null
         }
 
         public RegionSettings LoadRegionSettings(UUID regionUUID)
-        {
-            return null;
+        {

+            RegionSettings rs = new RegionSettings();

+            rs.RegionUUID = regionUUID;
+            return rs;
         }
 
         public void StoreObject(SceneObjectGroup obj, UUID regionUUID)