From f52917288a04e922edcf28b3184b37d87c3c69ea Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 15 Mar 2012 14:54:25 -0700 Subject: [PATCH] These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, needed. Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"" This reverts commit 5a9560db288a25799c93a3ecbd3544931149fa2a. --- .../CoreModules/World/WorldMap/MapSearchModule.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 657975b86e..c8c80db0bd 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 return; } -//m_log.DebugFormat("MAP NAME=({0})", mapName); + //m_log.DebugFormat("MAP NAME=({0})", mapName); + + // Hack to get around the fact that ll V3 now drops the port from the + // map name. See https://jira.secondlife.com/browse/VWR-28570 + // + // Caller, use this form instead: + // secondlife://mygrid.com|8002+Region+Name/128/128 + // the hacks we do with this viewer... + // + if (mapName.Contains("|")) + mapName = mapName.Replace('|', ':'); + if (mapName.Contains("+")) + mapName = mapName.Replace('+', ' '); // try to fetch from GridServer List regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);