aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2012-03-15 14:36:48 -0700
committerDiva Canto2012-03-15 14:36:48 -0700
commit5a9560db288a25799c93a3ecbd3544931149fa2a (patch)
tree43f637405b39c42caaf16fe9fcd5dbb822db75dd
parentRevert "More hacking around viewer bug" (diff)
downloadopensim-SC_OLD-5a9560db288a25799c93a3ecbd3544931149fa2a.zip
opensim-SC_OLD-5a9560db288a25799c93a3ecbd3544931149fa2a.tar.gz
opensim-SC_OLD-5a9560db288a25799c93a3ecbd3544931149fa2a.tar.bz2
opensim-SC_OLD-5a9560db288a25799c93a3ecbd3544931149fa2a.tar.xz
Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"
This reverts commit 697ac7fd9de244cb3b25ff8576838fd323b257c3.
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs14
1 files changed, 1 insertions, 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
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('+', ' ');
108 96
109 // try to fetch from GridServer 97 // try to fetch from GridServer
110 List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20); 98 List<GridRegion> regionInfos = m_scene.GridService.GetRegionsByName(m_scene.RegionInfo.ScopeID, mapName, 20);