Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-03-14 14:48:00 +00:00
8 changed files with 284 additions and 210 deletions

View File

@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
data = new MapBlockData();
data.Agents = 0;
data.Access = info.Access;
data.MapImageId = info.TerrainImage;
data.MapImageId = UUID.Zero; // could use info.TerrainImage but it seems to break viewer2
data.Name = info.RegionName;
data.RegionFlags = 0; // TODO not used?
data.WaterHeight = 0; // not used