aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2012-03-15 14:54:25 -0700
committerDiva Canto2012-03-15 14:54:25 -0700
commitf52917288a04e922edcf28b3184b37d87c3c69ea (patch)
treee8098632b9c52f9483765eda7098700a47941bdd /OpenSim
parentRevert "Hack around https://jira.secondlife.com/browse/VWR-28570" (diff)
downloadopensim-SC_OLD-f52917288a04e922edcf28b3184b37d87c3c69ea.zip
opensim-SC_OLD-f52917288a04e922edcf28b3184b37d87c3c69ea.tar.gz
opensim-SC_OLD-f52917288a04e922edcf28b3184b37d87c3c69ea.tar.bz2
opensim-SC_OLD-f52917288a04e922edcf28b3184b37d87c3c69ea.tar.xz
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.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs14
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);