aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs16
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs11
2 files changed, 9 insertions, 18 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 89f0e1a..f51a5e2 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Region.Communications.OGS1
159 serversInfo.GridURL), 159 serversInfo.GridURL),
160 e); 160 e);
161 161
162 throw(e2); 162 throw e2;
163 } 163 }
164 164
165 Hashtable GridRespData = (Hashtable)GridResp.Value; 165 Hashtable GridRespData = (Hashtable)GridResp.Value;
@@ -223,7 +223,7 @@ namespace OpenSim.Region.Communications.OGS1
223 serversInfo.GridURL), 223 serversInfo.GridURL),
224 e); 224 e);
225 225
226 throw(e2); 226 throw e2;
227 } 227 }
228 228
229 Hashtable GridRespData = (Hashtable) GridResp.Value; 229 Hashtable GridRespData = (Hashtable) GridResp.Value;
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Communications.OGS1
342 { 342 {
343 gridResp = gridReq.Send(serversInfo.GridURL, 3000); 343 gridResp = gridReq.Send(serversInfo.GridURL, 3000);
344 } 344 }
345 catch (WebException e) 345 catch (Exception e)
346 { 346 {
347 m_log.ErrorFormat( 347 m_log.ErrorFormat(
348 "[OGS1 GRID SERVICES]: Communication with the grid server at {0} failed, {1}", 348 "[OGS1 GRID SERVICES]: Communication with the grid server at {0} failed, {1}",
@@ -431,7 +431,7 @@ namespace OpenSim.Region.Communications.OGS1
431 } 431 }
432 } 432 }
433 } 433 }
434 catch (WebException) 434 catch
435 { 435 {
436 m_log.Error("[OGS1 GRID SERVICES]: " + 436 m_log.Error("[OGS1 GRID SERVICES]: " +
437 "Region lookup failed for: " + regionHandle.ToString() + 437 "Region lookup failed for: " + regionHandle.ToString() +
@@ -475,7 +475,7 @@ namespace OpenSim.Region.Communications.OGS1
475 if (!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle)) 475 if (!m_remoteRegionInfoCache.ContainsKey(regionInfo.RegionHandle))
476 m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo); 476 m_remoteRegionInfoCache.Add(regionInfo.RegionHandle, regionInfo);
477 } 477 }
478 catch (WebException) 478 catch
479 { 479 {
480 m_log.Error("[OGS1 GRID SERVICES]: " + 480 m_log.Error("[OGS1 GRID SERVICES]: " +
481 "Region lookup failed for: " + regionName + 481 "Region lookup failed for: " + regionName +
@@ -564,7 +564,7 @@ namespace OpenSim.Region.Communications.OGS1
564 } 564 }
565 catch (Exception e) 565 catch (Exception e)
566 { 566 {
567 m_log.Error("MapBlockQuery XMLRPC failure: " + e.ToString()); 567 m_log.Error("MapBlockQuery XMLRPC failure: " + e);
568 return new Hashtable(); 568 return new Hashtable();
569 } 569 }
570 } 570 }
@@ -1821,7 +1821,7 @@ namespace OpenSim.Region.Communications.OGS1
1821 if (UUID.TryParse((string)respData["friendID_" + i], out uuid)) tpdAway.Add(uuid); 1821 if (UUID.TryParse((string)respData["friendID_" + i], out uuid)) tpdAway.Add(uuid);
1822 } 1822 }
1823 } 1823 }
1824 catch(Exception e) 1824 catch (Exception e)
1825 { 1825 {
1826 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e); 1826 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e);
1827 } 1827 }
@@ -1857,7 +1857,7 @@ namespace OpenSim.Region.Communications.OGS1
1857 1857
1858 return (bool)respData["success"]; 1858 return (bool)respData["success"];
1859 } 1859 }
1860 catch(Exception e) 1860 catch (Exception e)
1861 { 1861 {
1862 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e); 1862 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e);
1863 return false; 1863 return false;
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
index 7e5b9d1..b6c36f8 100644
--- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs
@@ -540,16 +540,7 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap
540 } 540 }
541 if (httpserver.Length == 0) 541 if (httpserver.Length == 0)
542 { 542 {
543 RegionInfo mreg = null; 543 RegionInfo mreg = m_scene.SceneGridService.RequestNeighbouringRegionInfo(regionhandle);
544
545 try
546 {
547 mreg = m_scene.SceneGridService.RequestNeighbouringRegionInfo(regionhandle);
548 }
549 catch (Exception e)
550 {
551 m_log.WarnFormat("[WorldMap]: Requesting neighbour region info failed with exception {0}", e);
552 }
553 544
554 if (mreg != null) 545 if (mreg != null)
555 { 546 {