diff options
| author | Diva Canto | 2012-03-15 10:17:02 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-03-15 10:17:02 -0700 |
| commit | 697ac7fd9de244cb3b25ff8576838fd323b257c3 (patch) | |
| tree | d8534ce139242ce440da79eaf179cf7aa1d2337d /OpenSim | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-697ac7fd9de244cb3b25ff8576838fd323b257c3.zip opensim-SC_OLD-697ac7fd9de244cb3b25ff8576838fd323b257c3.tar.gz opensim-SC_OLD-697ac7fd9de244cb3b25ff8576838fd323b257c3.tar.bz2 opensim-SC_OLD-697ac7fd9de244cb3b25ff8576838fd323b257c3.tar.xz | |
Hack around https://jira.secondlife.com/browse/VWR-28570
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 657975b..c8c80db 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
| @@ -92,7 +92,19 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 92 | return; | 92 | return; |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | //m_log.DebugFormat("MAP NAME=({0})", mapName); | 95 | //m_log.DebugFormat("MAP NAME=({0})", mapName); |
| 96 | |||
| 97 | // Hack to get around the fact that ll V3 now drops the port from the | ||
| 98 | // map name. See https://jira.secondlife.com/browse/VWR-28570 | ||
| 99 | // | ||
| 100 | // Caller, use this form instead: | ||
| 101 | // secondlife://mygrid.com|8002+Region+Name/128/128 | ||
| 102 | // the hacks we do with this viewer... | ||
| 103 | // | ||
| 104 | if (mapName.Contains("|")) | ||
| 105 | mapName = mapName.Replace('|', ':'); | ||
| 106 | if (mapName.Contains("+")) | ||
| 107 | mapName = mapName.Replace('+', ' '); | ||
| 96 | 108 | ||
| 97 | // try to fetch from GridServer | 109 | // try to fetch from GridServer |
| 98 | List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); | 110 | List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); |