aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Modules/World/WorldMap
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-04 20:14:57 +0000
committerJustin Clarke Casey2008-11-04 20:14:57 +0000
commit21c0df53a2f24241850a29a7b2087df0019c8eb2 (patch)
tree29e56dca1119437a69d3f8ec4b49f507e519449d /OpenSim/Region/Environment/Modules/World/WorldMap
parent* Temporary fix to stop a problem in getting neighbour info in the world map ... (diff)
downloadopensim-SC_OLD-21c0df53a2f24241850a29a7b2087df0019c8eb2.zip
opensim-SC_OLD-21c0df53a2f24241850a29a7b2087df0019c8eb2.tar.gz
opensim-SC_OLD-21c0df53a2f24241850a29a7b2087df0019c8eb2.tar.bz2
opensim-SC_OLD-21c0df53a2f24241850a29a7b2087df0019c8eb2.tar.xz
* Improve the previous fix by pushing the exception catching down into OGS1 grid services
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/WorldMap')
-rw-r--r--OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs11
1 files changed, 1 insertions, 10 deletions
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 {