aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie2009-12-15 15:46:18 +0000
committerMelanie2009-12-15 15:46:18 +0000
commitf8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a (patch)
tree2304fc33d0b0aca36cc5acff1298d649ae03315e /OpenSim/Region/CoreModules
parentMerge branch 'master' into tests (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.zip
opensim-SC_OLD-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.tar.gz
opensim-SC_OLD-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.tar.bz2
opensim-SC_OLD-f8b6bc8d11c49d2415a00abbfbd2d53efd6d7e4a.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules')
-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 436f332..be46fa5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
108 { 108 {
109 // OK, we tried but there are no regions matching that name. 109 // OK, we tried but there are no regions matching that name.
110 // Let's check quickly if this is a domain name, and if so link to it 110 // Let's check quickly if this is a domain name, and if so link to it
111 if (mapName.Contains(".") && mapName.Contains(":")) 111 if (mapName.Contains("."))
112 { 112 {
113 // It probably is a domain name. Try to link to it. 113 // It probably is a domain name. Try to link to it.
114 GridRegion regInfo; 114 GridRegion regInfo;