diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 7 |
2 files changed, 9 insertions, 5 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 |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 1094970..8073f2d 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -205,8 +205,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
205 | { | 205 | { |
206 | //try | 206 | //try |
207 | //{ | 207 | //{ |
208 | //m_log.DebugFormat("[MAPLAYER]: request: {0}, path: {1}, param: {2}, agent:{3}", | 208 | //m_log.DebugFormat("[MAPLAYER]: path: {0}, param: {1}, agent:{2}", |
209 | //request, path, param,agentID.ToString()); | 209 | // path, param, agentID.ToString()); |
210 | 210 | ||
211 | // this is here because CAPS map requests work even beyond the 10,000 limit. | 211 | // this is here because CAPS map requests work even beyond the 10,000 limit. |
212 | ScenePresence avatarPresence = null; | 212 | ScenePresence avatarPresence = null; |
@@ -784,7 +784,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
784 | /// <param name="maxY"></param> | 784 | /// <param name="maxY"></param> |
785 | public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) | 785 | public virtual void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) |
786 | { | 786 | { |
787 | if ((flag & 0x10000) != 0) // user clicked on the map a tile that isn't visible | 787 | //m_log.ErrorFormat("[YYY] RequestMapBlocks {0}={1}={2}={3} {4}", minX, minY, maxX, maxY, flag); |
788 | if ((flag & 0x10000) != 0) // user clicked on qthe map a tile that isn't visible | ||
788 | { | 789 | { |
789 | List<MapBlockData> response = new List<MapBlockData>(); | 790 | List<MapBlockData> response = new List<MapBlockData>(); |
790 | 791 | ||