diff options
author | BlueWall | 2011-03-21 22:06:43 -0400 |
---|---|---|
committer | BlueWall | 2011-03-21 22:06:43 -0400 |
commit | e3c327a305dcf795f372b940f34538a19bf92218 (patch) | |
tree | b034355a12c4d87410809aa19bf6015e611e1e22 /OpenSim/Region/CoreModules/World/WorldMap | |
parent | Merge branch 'master' of /home/opensim/src/OpenSim/Core (diff) | |
parent | Thanks Kevin Cozens for a patch that: (diff) | |
download | opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.zip opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.gz opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.bz2 opensim-SC_OLD-e3c327a305dcf795f372b940f34538a19bf92218.tar.xz |
Merge branch 'master' of /home/opensim/src/OpenSim/Core
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | 6 |
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) |