Fixes gray tiles on map search for viewers 1.

1 files changed, 5 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index c059a5f..00959b0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
             else if (regionInfos.Count == 0 && mapName.StartsWith("http://"))
                 remoteClient.SendAlertMessage("Hyperlink could not be established.");
 
-            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count);
+            m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags);
             List<MapBlockData> blocks = new List<MapBlockData>();
 
             MapBlockData data;
@@ -117,7 +117,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     data = new MapBlockData();
                     data.Agents = 0;
                     data.Access = info.Access;
-                    data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2
+                    if (flags == 2) // V2 sends this
+                        data.MapImageId = UUID.Zero; 
+                    else
+                        data.MapImageId = info.TerrainImage;
                     data.Name = info.RegionName;
                     data.RegionFlags = 0; // TODO not used?
                     data.WaterHeight = 0; // not used