1 files changed, 30 insertions, 31 deletions

diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index d596698..397b32d 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Data.Null
             if (Instance == null)
                 Instance = this;
             //Console.WriteLine("[XXX] NullRegionData constructor");
-        }
-
+        }

+

         public List<RegionData> Get(string regionName, UUID scopeID)
         {
             if (Instance != this)
@@ -160,38 +160,37 @@ namespace OpenSim.Data.Null
             m_regionData.Remove(regionID);
 
             return true;
-        }
-
+        }

+

         public List<RegionData> GetDefaultRegions(UUID scopeID)
-        {
-            if (Instance != this)
-                return Instance.GetDefaultRegions(scopeID);
-
-            List<RegionData> ret = new List<RegionData>();
-
-            foreach (RegionData r in m_regionData.Values)
-            {
-                if ((Convert.ToInt32(r.Data["flags"]) & 1) != 0)
-                    ret.Add(r);
-            }
-
-            return ret;
+        {

+            return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
-        {
-            if (Instance != this)
-                return Instance.GetFallbackRegions(scopeID, x, y);
-
-            List<RegionData> ret = new List<RegionData>();
-
-            foreach (RegionData r in m_regionData.Values)
-            {
-                if ((Convert.ToInt32(r.Data["flags"]) & 2) != 0)
-                    ret.Add(r);
-            }
-
-            return ret;
-        }
+        {

+            return Get((int)RegionFlags.FallbackRegion, scopeID);

+        }

+

+        public List<RegionData> GetHyperlinks(UUID scopeID)

+        {

+            return Get((int)RegionFlags.Hyperlink, scopeID);

+        }

+

+        private List<RegionData> Get(int regionFlags, UUID scopeID)

+        {

+            if (Instance != this)

+                return Instance.Get(regionFlags, scopeID);

+

+            List<RegionData> ret = new List<RegionData>();

+

+            foreach (RegionData r in m_regionData.Values)

+            {

+                if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0)

+                    ret.Add(r);

+            }

+

+            return ret;

+        }

     }
 }
\ No newline at end of file