diff options
author | Diva Canto | 2011-01-06 12:53:54 -0800 |
---|---|---|
committer | Diva Canto | 2011-01-06 12:53:54 -0800 |
commit | 81587466e72cfb989c0cb3fa74ae5ff6e7f861bb (patch) | |
tree | ec83e9f9995d739521ab42928dbe245fdcca6650 | |
parent | HG map tile fetch: handle cached images appropriately. (diff) | |
download | opensim-SC-81587466e72cfb989c0cb3fa74ae5ff6e7f861bb.zip opensim-SC-81587466e72cfb989c0cb3fa74ae5ff6e7f861bb.tar.gz opensim-SC-81587466e72cfb989c0cb3fa74ae5ff6e7f861bb.tar.bz2 opensim-SC-81587466e72cfb989c0cb3fa74ae5ff6e7f861bb.tar.xz |
Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search.
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index bdd1a0b..cc28a5b 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
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) regionInfos.Add(info); |
104 | } | 104 | } |
105 | 105 | m_log.DebugFormat("[MAPSEARCHMODULE]: search returned {0} regions", regionInfos.Count); | |
106 | List<MapBlockData> blocks = new List<MapBlockData>(); | 106 | List<MapBlockData> blocks = new List<MapBlockData>(); |
107 | 107 | ||
108 | MapBlockData data; | 108 | MapBlockData data; |
@@ -128,14 +128,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
128 | data.Agents = 0; | 128 | data.Agents = 0; |
129 | data.Access = 255; | 129 | data.Access = 255; |
130 | data.MapImageId = UUID.Zero; | 130 | data.MapImageId = UUID.Zero; |
131 | data.Name = mapName; | 131 | data.Name = ""; // mapName; |
132 | data.RegionFlags = 0; | 132 | data.RegionFlags = 0; |
133 | data.WaterHeight = 0; // not used | 133 | data.WaterHeight = 0; // not used |
134 | data.X = 0; | 134 | data.X = 0; |
135 | data.Y = 0; | 135 | data.Y = 0; |
136 | blocks.Add(data); | 136 | blocks.Add(data); |
137 | 137 | ||
138 | remoteClient.SendMapBlock(blocks, 2); | 138 | remoteClient.SendMapBlock(blocks, 0); |
139 | } | 139 | } |
140 | 140 | ||
141 | // private Scene GetClientScene(IClientAPI client) | 141 | // private Scene GetClientScene(IClientAPI client) |