Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge

2 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index 8db8064..d64136d 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -84,6 +84,11 @@ namespace OpenSim.Data.Null
         {
             return new EstateSettings();
         }
+
+        public EstateSettings CreateNewEstate()
+        {
+            return new EstateSettings();
+        }
         
         public List<EstateSettings> LoadEstateSettingsAll()
         {
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)