diff options
author | Diva Canto | 2011-05-09 10:25:42 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-09 10:25:42 -0700 |
commit | 8a5f6dc7a534fcdcfc877a6eac2553b18532e760 (patch) | |
tree | 2c7e174769b0ca1f60102976a422747e13a29121 /OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |
parent | The map is seriously broken. This doesn't fix it, but at least provides one m... (diff) | |
download | opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.zip opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.tar.gz opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.tar.bz2 opensim-SC_OLD-8a5f6dc7a534fcdcfc877a6eac2553b18532e760.tar.xz |
Fixes gray tiles on map search for viewers 1.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 7 |
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 | |||
106 | else if (regionInfos.Count == 0 && mapName.StartsWith("http://")) | 106 | else if (regionInfos.Count == 0 && mapName.StartsWith("http://")) |
107 | remoteClient.SendAlertMessage("Hyperlink could not be established."); | 107 | remoteClient.SendAlertMessage("Hyperlink could not be established."); |
108 | 108 | ||
109 | m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions", mapName, regionInfos.Count); | 109 | m_log.DebugFormat("[MAPSEARCHMODULE]: search {0} returned {1} regions. Flags={2}", mapName, regionInfos.Count, flags); |
110 | List<MapBlockData> blocks = new List<MapBlockData>(); | 110 | List<MapBlockData> blocks = new List<MapBlockData>(); |
111 | 111 | ||
112 | MapBlockData data; | 112 | MapBlockData data; |
@@ -117,7 +117,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
117 | data = new MapBlockData(); | 117 | data = new MapBlockData(); |
118 | data.Agents = 0; | 118 | data.Agents = 0; |
119 | data.Access = info.Access; | 119 | data.Access = info.Access; |
120 | data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2 | 120 | if (flags == 2) // V2 sends this |
121 | data.MapImageId = UUID.Zero; | ||
122 | else | ||
123 | data.MapImageId = info.TerrainImage; | ||
121 | data.Name = info.RegionName; | 124 | data.Name = info.RegionName; |
122 | data.RegionFlags = 0; // TODO not used? | 125 | data.RegionFlags = 0; // TODO not used? |
123 | data.WaterHeight = 0; // not used | 126 | data.WaterHeight = 0; // not used |