From 5a9560db288a25799c93a3ecbd3544931149fa2a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 15 Mar 2012 14:36:48 -0700 Subject: Revert "Hack around https://jira.secondlife.com/browse/VWR-28570" This reverts commit 697ac7fd9de244cb3b25ff8576838fd323b257c3. --- .../Region/CoreModules/World/WorldMap/MapSearchModule.cs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index c8c80db..657975b 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs @@ -92,19 +92,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap return; } - //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('+', ' '); +//m_log.DebugFormat("MAP NAME=({0})", mapName); // try to fetch from GridServer List regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); -- cgit v1.1