1 files changed, 6 insertions, 2 deletions

diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 5e7e238..cf0e0e8 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -397,7 +397,10 @@ namespace OpenSim.Region.Communications.OGS1
 
         public RegionInfo RequestClosestRegion(string regionName)
         {
-            // Don't use this method.  It's only for SLURLS and Logins
+            foreach (RegionInfo ri in m_remoteRegionInfoCache.Values)
+                if(ri.RegionName == regionName)
+                    return ri;
+
             RegionInfo regionInfo = null;
             try
             {
@@ -438,7 +441,8 @@ namespace OpenSim.Region.Communications.OGS1
                 regionInfo.RegionID = new LLUUID((string) responseData["region_UUID"]);
                 regionInfo.RegionName = (string) responseData["region_name"];
 
-                m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo);
+                if(!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle))
+                    m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo);
             }
             catch (WebException)
             {