diff options
| author | Justin Clarke Casey | 2008-11-04 19:56:02 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-11-04 19:56:02 +0000 |
| commit | f793f93817c76e1a737dad891de81320452f308d (patch) | |
| tree | 8ecdd8b8eeb23f92285129d755a8a424cc801be4 /OpenSim | |
| parent | * minor: doc and log message tweaking for wearables (diff) | |
| download | opensim-SC-f793f93817c76e1a737dad891de81320452f308d.zip opensim-SC-f793f93817c76e1a737dad891de81320452f308d.tar.gz opensim-SC-f793f93817c76e1a737dad891de81320452f308d.tar.bz2 opensim-SC-f793f93817c76e1a737dad891de81320452f308d.tar.xz | |
* Temporary fix to stop a problem in getting neighbour info in the world map module from crashing the entire server
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs index 96061ba..7e5b9d1 100644 --- a/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/Environment/Modules/World/WorldMap/WorldMapModule.cs | |||
| @@ -540,7 +540,17 @@ namespace OpenSim.Region.Environment.Modules.World.WorldMap | |||
| 540 | } | 540 | } |
| 541 | if (httpserver.Length == 0) | 541 | if (httpserver.Length == 0) |
| 542 | { | 542 | { |
| 543 | RegionInfo mreg = m_scene.SceneGridService.RequestNeighbouringRegionInfo(regionhandle); | 543 | RegionInfo mreg = null; |
| 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 | if (mreg != null) | 554 | if (mreg != null) |
| 545 | { | 555 | { |
| 546 | httpserver = "http://" + mreg.ExternalEndPoint.Address.ToString() + ":" + mreg.HttpPort + "/MAP/MapItems/" + regionhandle.ToString(); | 556 | httpserver = "http://" + mreg.ExternalEndPoint.Address.ToString() + ":" + mreg.HttpPort + "/MAP/MapItems/" + regionhandle.ToString(); |