4 files changed, 44 insertions, 11 deletions

diff --git a/OpenSim/Data/Null/NullEstateData.cs b/OpenSim/Data/Null/NullEstateData.cs
index d64136d..1df397d 100755
--- a/OpenSim/Data/Null/NullEstateData.cs
+++ b/OpenSim/Data/Null/NullEstateData.cs
@@ -42,6 +42,22 @@ namespace OpenSim.Data.Null
 
 //        private string m_connectionString;
 
+        private Dictionary<uint, EstateSettings> m_knownEstates = new Dictionary<uint, EstateSettings>();
+        private EstateSettings m_estate = null;
+
+        private EstateSettings GetEstate()
+        {
+            if (m_estate == null)
+            {
+                // This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase).
+                // The estate info is pretty empty so don't try banning anyone.
+                m_estate = new EstateSettings();
+                m_estate.EstateID = 1;
+                m_estate.OnSave += StoreEstateSettings;
+            }
+            return m_estate;
+        }
+
         protected virtual Assembly Assembly
         {
             get { return GetType().Assembly; }
@@ -68,21 +84,18 @@ namespace OpenSim.Data.Null
 
         public EstateSettings LoadEstateSettings(UUID regionID, bool create)
         {
-            // This fools the initialization caller into thinking an estate was fetched (a check in OpenSimBase).
-            // The estate info is pretty empty so don't try banning anyone.
-            EstateSettings oneEstate = new EstateSettings();
-            oneEstate.EstateID = 1;
-            return oneEstate;
+            return GetEstate();
         }
 
         public void StoreEstateSettings(EstateSettings es)
         {
+            m_estate = es;
             return;
         }
 
         public EstateSettings LoadEstateSettings(int estateID)
         {
-            return new EstateSettings();
+            return GetEstate();
         }
 
         public EstateSettings CreateNewEstate()
@@ -93,13 +106,14 @@ namespace OpenSim.Data.Null
         public List<EstateSettings> LoadEstateSettingsAll()
         {
             List<EstateSettings> allEstateSettings = new List<EstateSettings>();
-            allEstateSettings.Add(new EstateSettings());
+            allEstateSettings.Add(GetEstate());
             return allEstateSettings;
         }
         
         public List<int> GetEstatesAll()
         {
             List<int> result = new List<int>();
+            result.Add((int)GetEstate().EstateID);
             return result;            
         }
 
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index f707d98..d28cd99 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -239,6 +239,11 @@ namespace OpenSim.Data.Null
             return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
+        public List<RegionData> GetDefaultHypergridRegions(UUID scopeID)
+        {
+            return Get((int)RegionFlags.DefaultHGRegion, scopeID);
+        }
+
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
         {
             List<RegionData> regions = Get((int)RegionFlags.FallbackRegion, scopeID);
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs
index e7e5c41..15824a9 100644
--- a/OpenSim/Data/Null/NullSimulationData.cs
+++ b/OpenSim/Data/Null/NullSimulationData.cs
@@ -77,20 +77,34 @@ namespace OpenSim.Data.Null
         }
 
         #region Environment Settings
+
+        private Dictionary<UUID, string> EnvironmentSettings = new Dictionary<UUID, string>();
+
         public string LoadRegionEnvironmentSettings(UUID regionUUID)
         {
-            //This connector doesn't support the Environment module yet
+            lock (EnvironmentSettings)
+            {
+                if (EnvironmentSettings.ContainsKey(regionUUID))
+                    return EnvironmentSettings[regionUUID];
+            }
             return string.Empty;
         }
 
         public void StoreRegionEnvironmentSettings(UUID regionUUID, string settings)
         {
-            //This connector doesn't support the Environment module yet
+            lock (EnvironmentSettings)
+            {
+                EnvironmentSettings[regionUUID] = settings;
+            }
         }
 
         public void RemoveRegionEnvironmentSettings(UUID regionUUID)
         {
-            //This connector doesn't support the Environment module yet
+            lock (EnvironmentSettings)
+            {
+                if (EnvironmentSettings.ContainsKey(regionUUID))
+                    EnvironmentSettings.Remove(regionUUID);
+            }
         }
         #endregion
 
diff --git a/OpenSim/Data/Null/Properties/AssemblyInfo.cs b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
index 1e02c31..28ef51a 100644
--- a/OpenSim/Data/Null/Properties/AssemblyInfo.cs
+++ b/OpenSim/Data/Null/Properties/AssemblyInfo.cs
@@ -61,5 +61,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
 
-[assembly : AssemblyVersion("0.7.6.*")]
+[assembly : AssemblyVersion("0.8.0.*")]