Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim

Conflicts:
	OpenSim/Data/MySQL/MySQLRegionData.cs

1 files changed, 2 insertions, 4 deletions

diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index 588b8ac..218fcd0 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -40,6 +40,7 @@ namespace OpenSim.Data.Null
 
         public NullRegionData(string connectionString, string realm)
         {
+            //Console.WriteLine("[XXX] NullRegionData constructor");
         }
 
         public List<RegionData> Get(string regionName, UUID scopeID)
@@ -100,10 +101,7 @@ namespace OpenSim.Data.Null
                     ret.Add(r);
             }
 
-            if (ret.Count > 0)
-                return ret;
-
-            return null;
+            return ret;
         }
 
         public bool Store(RegionData data)