diff options
author | Diva Canto | 2010-12-14 08:11:49 -0800 |
---|---|---|
committer | Diva Canto | 2010-12-14 08:11:49 -0800 |
commit | 55e04e6c68766399695a27d071c9298d90eafe13 (patch) | |
tree | e22d1e78435404554d6a7ffd4ac3d4693eafdbd4 /OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |
parent | Null checking ParentGroup is not needed. It can't be null. (diff) | |
download | opensim-SC_OLD-55e04e6c68766399695a27d071c9298d90eafe13.zip opensim-SC_OLD-55e04e6c68766399695a27d071c9298d90eafe13.tar.gz opensim-SC_OLD-55e04e6c68766399695a27d071c9298d90eafe13.tar.bz2 opensim-SC_OLD-55e04e6c68766399695a27d071c9298d90eafe13.tar.xz |
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 9f88517..bdd1a0b 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -93,13 +93,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
93 | } | 93 | } |
94 | 94 | ||
95 | // try to fetch from GridServer | 95 | // try to fetch from GridServer |
96 | List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(UUID.Zero, mapName, 20); | 96 | List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); |
97 | if (regionInfos == null) | 97 | if (regionInfos == null) |
98 | { | 98 | { |
99 | m_log.Warn("[MAPSEARCHMODULE]: RequestNamedRegions returned null. Old gridserver?"); | 99 | m_log.Warn("[MAPSEARCHMODULE]: RequestNamedRegions returned null. Old gridserver?"); |
100 | // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region | 100 | // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region |
101 | regionInfos = new List<GridRegion>(); | 101 | regionInfos = new List<GridRegion>(); |
102 | GridRegion info = m_scene.GridService.GetRegionByName(UUID.Zero, mapName); | 102 | GridRegion info = m_scene.GridService.GetRegionByName(m_scene.RegionInfo.ScopeID, mapName); |
103 | if (info != null) regionInfos.Add(info); | 103 | if (info != null) regionInfos.Add(info); |
104 | } | 104 | } |
105 | 105 | ||