aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMic Bowman2011-03-10 15:23:46 -0800
committerMic Bowman2011-03-10 15:23:46 -0800
commit836ab6b0e87c16bcff171d0491476f19d7c18a2c (patch)
tree45686ad2d67399d897dc917d3cee2d693551f5de
parentAdd test for simple case where creator account with appropriate uuid exists o... (diff)
downloadopensim-SC_OLD-836ab6b0e87c16bcff171d0491476f19d7c18a2c.zip
opensim-SC_OLD-836ab6b0e87c16bcff171d0491476f19d7c18a2c.tar.gz
opensim-SC_OLD-836ab6b0e87c16bcff171d0491476f19d7c18a2c.tar.bz2
opensim-SC_OLD-836ab6b0e87c16bcff171d0491476f19d7c18a2c.tar.xz
Change how map blocks are encoded to make map search
work with viewer 2.
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index a9e46d0..7bb7544 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
113 data = new MapBlockData(); 113 data = new MapBlockData();
114 data.Agents = 0; 114 data.Agents = 0;
115 data.Access = info.Access; 115 data.Access = info.Access;
116 data.MapImageId = info.TerrainImage; 116 data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2
117 data.Name = info.RegionName; 117 data.Name = info.RegionName;
118 data.RegionFlags = 0; // TODO not used? 118 data.RegionFlags = 0; // TODO not used?
119 data.WaterHeight = 0; // not used 119 data.WaterHeight = 0; // not used
@@ -135,7 +135,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
135 data.Y = 0; 135 data.Y = 0;
136 blocks.Add(data); 136 blocks.Add(data);
137 137
138 remoteClient.SendMapBlock(blocks, 0); 138 // not sure what the flags do here, but seems to be necessary
139 // to set to "2" for viewer 2
140 remoteClient.SendMapBlock(blocks, 2);
139 } 141 }
140 142
141// private Scene GetClientScene(IClientAPI client) 143// private Scene GetClientScene(IClientAPI client)