2 files changed, 39 insertions, 28 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index b14bd3d..dbac148 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -39,6 +39,7 @@ namespace OpenSim.Region.Communications.Local
     {
         protected Dictionary<ulong, RegionInfo> m_regions = new Dictionary<ulong, RegionInfo>();
         protected Dictionary<ulong, RegionCommsListener> m_regionListeners = new Dictionary<ulong, RegionCommsListener>();
+        private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
 
         public LocalBackEndServices()
         {
@@ -128,8 +129,8 @@ namespace OpenSim.Region.Communications.Local
                     map.Name = regInfo.RegionName;
                     map.X = (ushort)regInfo.RegionLocX;
                     map.Y = (ushort)regInfo.RegionLocY;
-                    map.WaterHeight = (byte)regInfo.estateSettings.waterHeight;
-                    map.MapImageId = regInfo.estateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
+                    map.WaterHeight = (byte)regInfo.EstateSettings.waterHeight;
+                    map.MapImageId = regInfo.EstateSettings.terrainImageID; //new LLUUID("00000000-0000-0000-9999-000000000007");
                     map.Agents = 1;
                     map.RegionFlags = 72458694;
                     map.Access = 13;
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index cc56078..9e74148 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
     public class OGS1GridServices : IGridServices, IInterRegionCommunications
     {
         private LocalBackEndServices m_localBackend = new LocalBackEndServices();
+        private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
 
         public BaseHttpServer httpListener;
         public NetworkServersInfo serversInfo;
@@ -89,7 +90,7 @@ namespace OpenSim.Region.Communications.OGS1
             GridParams["sim_name"] = regionInfo.RegionName;
             GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
             GridParams["remoting_port"] = serversInfo.RemotingListenerPort.ToString();
-            GridParams["map-image-id"] = regionInfo.estateSettings.terrainImageID.ToStringHyphenated();
+            GridParams["map-image-id"] = regionInfo.EstateSettings.terrainImageID.ToStringHyphenated();
 
             // Package into an XMLRPC Request
             ArrayList SendParams = new ArrayList();
@@ -152,6 +153,7 @@ namespace OpenSim.Region.Communications.OGS1
             return neighbours;
         }
 
+
         /// <summary>
         /// 
         /// </summary>
@@ -166,37 +168,45 @@ namespace OpenSim.Region.Communications.OGS1
                 return regionInfo;
             }
 
-            Hashtable requestData = new Hashtable();
-            requestData["region_handle"] = regionHandle.ToString();
-            requestData["authkey"] = this.serversInfo.GridSendKey;
-            ArrayList SendParams = new ArrayList();
-            SendParams.Add(requestData);
-            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
-            XmlRpcResponse GridResp = GridReq.Send(this.serversInfo.GridURL, 3000);
-
-            Hashtable responseData = (Hashtable)GridResp.Value;
-
-            if (responseData.ContainsKey("error"))
+            if (m_remoteRegionInfoCache.TryGetValue(regionHandle, out regionInfo))
             {
-                Console.WriteLine("error received from grid server" + responseData["error"]);
-                return null;
             }
+            else
+            {
+                Hashtable requestData = new Hashtable();
+                requestData["region_handle"] = regionHandle.ToString();
+                requestData["authkey"] = this.serversInfo.GridSendKey;
+                ArrayList SendParams = new ArrayList();
+                SendParams.Add(requestData);
+                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
+                XmlRpcResponse GridResp = GridReq.Send(this.serversInfo.GridURL, 3000);
 
-            uint regX = Convert.ToUInt32((string)responseData["region_locx"]);
-            uint regY = Convert.ToUInt32((string)responseData["region_locy"]);
-            string internalIpStr = (string)responseData["sim_ip"];
-            uint port = Convert.ToUInt32(responseData["sim_port"]);
-            string externalUri = (string)responseData["sim_uri"];
+                Hashtable responseData = (Hashtable) GridResp.Value;
 
-            IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int)port);
-            string neighbourExternalUri = externalUri;
-            regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
+                if (responseData.ContainsKey("error"))
+                {
+                    Console.WriteLine("error received from grid server" + responseData["error"]);
+                    return null;
+                }
+
+                uint regX = Convert.ToUInt32((string) responseData["region_locx"]);
+                uint regY = Convert.ToUInt32((string) responseData["region_locy"]);
+                string internalIpStr = (string) responseData["sim_ip"];
+                uint port = Convert.ToUInt32(responseData["sim_port"]);
+                string externalUri = (string) responseData["sim_uri"];
 
-            regionInfo.RemotingPort = Convert.ToUInt32((string)responseData["remoting_port"]);
-            regionInfo.RemotingAddress = internalIpStr;
+                IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
+                string neighbourExternalUri = externalUri;
+                regionInfo = new RegionInfo(regX, regY, neighbourInternalEndPoint, internalIpStr);
 
-            regionInfo.RegionID = new LLUUID((string)responseData["region_UUID"]);
-            regionInfo.RegionName = (string)responseData["region_name"];
+                regionInfo.RemotingPort = Convert.ToUInt32((string) responseData["remoting_port"]);
+                regionInfo.RemotingAddress = internalIpStr;
+
+                regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]);
+                regionInfo.RegionName = (string) responseData["region_name"];
+
+                m_remoteRegionInfoCache.Add( regionHandle, regionInfo );
+            }
 
             return regionInfo;
         }