diff options
| author | Melanie | 2012-03-21 00:26:02 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-21 00:26:02 +0000 |
| commit | ee9210f656f754e2caa40cb6ff39463cbf286347 (patch) | |
| tree | 8097bad8a37e210bfbdeff113a9ab00d853ad9ac /OpenSim/Region/CoreModules/World | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Refix the fixed fix! (diff) | |
| download | opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.zip opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.gz opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.bz2 opensim-SC-ee9210f656f754e2caa40cb6ff39463cbf286347.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 2 |
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 3efb7dd..4e6bfb8 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; |