diff options
author | Sean McNamara | 2011-04-10 18:28:54 -0400 |
---|---|---|
committer | Sean McNamara | 2011-04-10 18:28:54 -0400 |
commit | 9c0f3c73b1fd56ac145e866af0316a3285ddb689 (patch) | |
tree | 03541a853c2ecf5829ac296537b14d4553ad4b2e /OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |
parent | Merge git://opensimulator.org/git/opensim (diff) | |
parent | minor: remove mono compiler warnings (diff) | |
download | opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.zip opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.gz opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.bz2 opensim-SC_OLD-9c0f3c73b1fd56ac145e866af0316a3285ddb689.tar.xz |
Merge git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index a9e46d0..f9ef286 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -100,8 +100,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
100 | // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region | 100 | // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region |
101 | regionInfos = new List<GridRegion>(); | 101 | regionInfos = new List<GridRegion>(); |
102 | GridRegion info = m_scene.GridService.GetRegionByName(m_scene.RegionInfo.ScopeID, mapName); | 102 | GridRegion info = m_scene.GridService.GetRegionByName(m_scene.RegionInfo.ScopeID, mapName); |
103 | if (info != null) regionInfos.Add(info); | 103 | if (info != null) |
104 | regionInfos.Add(info); | ||
104 | } | 105 | } |
106 | else if (regionInfos.Count == 0 && mapName.StartsWith("http://")) | ||
107 | remoteClient.SendAlertMessage("Hyperlink could not be established."); | ||
108 | |||
105 | m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); | 109 | m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); |
106 | List<MapBlockData> blocks = new List<MapBlockData>(); | 110 | List<MapBlockData> blocks = new List<MapBlockData>(); |
107 | 111 | ||
@@ -113,7 +117,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
113 | data = new MapBlockData(); | 117 | data = new MapBlockData(); |
114 | data.Agents = 0; | 118 | data.Agents = 0; |
115 | data.Access = info.Access; | 119 | data.Access = info.Access; |
116 | data.MapImageId = info.TerrainImage; | 120 | data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2 |
117 | data.Name = info.RegionName; | 121 | data.Name = info.RegionName; |
118 | data.RegionFlags = 0; // TODO not used? | 122 | data.RegionFlags = 0; // TODO not used? |
119 | data.WaterHeight = 0; // not used | 123 | data.WaterHeight = 0; // not used |
@@ -135,7 +139,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
135 | data.Y = 0; | 139 | data.Y = 0; |
136 | blocks.Add(data); | 140 | blocks.Add(data); |
137 | 141 | ||
138 | remoteClient.SendMapBlock(blocks, 0); | 142 | // not sure what the flags do here, but seems to be necessary |
143 | // to set to "2" for viewer 2 | ||
144 | remoteClient.SendMapBlock(blocks, 2); | ||
139 | } | 145 | } |
140 | 146 | ||
141 | // private Scene GetClientScene(IClientAPI client) | 147 | // private Scene GetClientScene(IClientAPI client) |