1 files changed, 14 insertions, 3 deletions

diff --git a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
index 596f867..ded7806 100644
--- a/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/GridServicesConnector.cs
@@ -49,6 +49,9 @@ namespace OpenSim.Services.Connectors
 
         private string m_ServerURI = String.Empty;
 
+        private ExpiringCache<ulong, GridRegion> m_regionCache =
+                new ExpiringCache<ulong, GridRegion>();
+
         public GridServicesConnector()
         {
         }
@@ -275,6 +278,13 @@ namespace OpenSim.Services.Connectors
 
         public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
         {
+            GridRegion rinfo = null;
+            ulong regionHandle = Util.UIntsToLong((uint)x, (uint)y);
+
+            // this cache includes NULL regions
+            if (m_regionCache.TryGetValue(regionHandle, out rinfo))
+                return rinfo;
+
             Dictionary<string, object> sendData = new Dictionary<string, object>();
 
             sendData["SCOPEID"] = scopeID.ToString();
@@ -296,7 +306,6 @@ namespace OpenSim.Services.Connectors
                 return null;
             }
 
-            GridRegion rinfo = null;
             if (reply != string.Empty)
             {
                 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
@@ -316,6 +325,8 @@ namespace OpenSim.Services.Connectors
             else
                 m_log.DebugFormat("[GRID CONNECTOR]: GetRegionByPosition received null reply");
 
+            m_regionCache.Add(regionHandle, rinfo, TimeSpan.FromSeconds(600));
+
             return rinfo;
         }
 
@@ -672,7 +683,7 @@ namespace OpenSim.Services.Connectors
 
             return rinfos;
         }
-        
+
         public int GetRegionFlags(UUID scopeID, UUID regionID)
         {
             Dictionary<string, object> sendData = new Dictionary<string, object>();
@@ -744,7 +755,7 @@ namespace OpenSim.Services.Connectors
             if (reply != string.Empty)
             {
                 Dictionary<string, object> replyData = ServerUtils.ParseXmlResponse(reply);
-                
+
                 if ((replyData != null) && replyData.Count > 0)
                 {
                     foreach (string key in replyData.Keys)