aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorDiva Canto2012-03-20 17:29:34 -0700
committerDiva Canto2012-03-20 17:29:34 -0700
commit9e8b1943566a8aa6e454615798436c2039e9ad65 (patch)
treef2ca5943b60f10443401c65cd72fccb889955f15 /OpenSim/Region
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-9e8b1943566a8aa6e454615798436c2039e9ad65.zip
opensim-SC_OLD-9e8b1943566a8aa6e454615798436c2039e9ad65.tar.gz
opensim-SC_OLD-9e8b1943566a8aa6e454615798436c2039e9ad65.tar.bz2
opensim-SC_OLD-9e8b1943566a8aa6e454615798436c2039e9ad65.tar.xz
Fixed borkness with map search introduce by my last changes to it.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index d60909c..f37dd94 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
132 data.MapImageId = info.TerrainImage; 132 data.MapImageId = info.TerrainImage;
133 // ugh! V2-3 is very sensitive about the result being 133 // ugh! V2-3 is very sensitive about the result being
134 // exactly the same as the requested name 134 // exactly the same as the requested name
135 if (regionInfos.Count == 1) 135 if (regionInfos.Count == 1 && mapNameOrig.Contains("|") || mapNameOrig.Contains("+"))
136 data.Name = mapNameOrig; 136 data.Name = mapNameOrig;
137 else 137 else
138 data.Name = info.RegionName; 138 data.Name = info.RegionName;