diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index ab2e064..3a0bdc3 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -201,23 +201,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
201 | data = new MapBlockData(); | 201 | data = new MapBlockData(); |
202 | data.Agents = 0; | 202 | data.Agents = 0; |
203 | data.Access = info.Access; | 203 | data.Access = info.Access; |
204 | if (flags == 2) // V2 sends this | 204 | MapBlockData block = new MapBlockData(); |
205 | { | 205 | WorldMap.MapBlockFromGridRegion(block, info, flags); |
206 | List<MapBlockData> datas = WorldMap.Map2BlockFromGridRegion(info, flags); | ||
207 | // ugh! V2-3 is very sensitive about the result being | ||
208 | // exactly the same as the requested name | ||
209 | 206 | ||
210 | if (regionInfos.Count == 1 && needOriginalName) | 207 | if (flags == 2 && regionInfos.Count == 1 && needOriginalName) |
211 | datas.ForEach(d => d.Name = mapNameOrig); | 208 | block.Name = mapNameOrig; |
212 | 209 | blocks.Add(block); | |
213 | blocks.AddRange(datas); | ||
214 | } | ||
215 | else | ||
216 | { | ||
217 | MapBlockData block = new MapBlockData(); | ||
218 | WorldMap.MapBlockFromGridRegion(block,info, flags); | ||
219 | blocks.Add(block); | ||
220 | } | ||
221 | } | 210 | } |
222 | } | 211 | } |
223 | 212 | ||