Merge branch 'master' into httptests

1 files changed, 4 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 6c6ccf9..ceb2146 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -278,10 +278,12 @@ namespace OpenSim.Services.Connectors
 
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
+            GridRegion rinfo = null;
             ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
 
-            if (m_regionCache.Contains(regionHandle))
-                return (GridRegion)m_regionCache[regionHandle];
+            // this cache includes NULL regions
+            if (m_regionCache.TryGetValue(regionHandle, out rinfo))
+                return rinfo;
 
             Dictionary<string, object> sendData = new Dictionary<string, object>();
 
@@ -304,7 +306,6 @@ namespace OpenSim.Services.Connectors
                 return null;
             }
 
-            GridRegion rinfo = null;
             if (reply != string.Empty)
             {
                 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);