diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index be6b240..724bb4c 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1343,14 +1343,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1343 | if (terrain == null) | 1343 | if (terrain == null) |
1344 | return; | 1344 | return; |
1345 | 1345 | ||
1346 | m_log.DebugFormat("[WORLDMAP]: Generating map image for {0}", m_scene.RegionInfo.RegionName); | ||
1347 | |||
1346 | byte[] data = terrain.WriteJpeg2000Image(); | 1348 | byte[] data = terrain.WriteJpeg2000Image(); |
1347 | if (data == null) | 1349 | if (data == null) |
1348 | return; | 1350 | return; |
1349 | 1351 | ||
1350 | byte[] overlay = GenerateOverlay(); | 1352 | byte[] overlay = GenerateOverlay(); |
1351 | 1353 | ||
1352 | m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE"); | ||
1353 | |||
1354 | UUID terrainImageID = UUID.Random(); | 1354 | UUID terrainImageID = UUID.Random(); |
1355 | UUID parcelImageID = UUID.Zero; | 1355 | UUID parcelImageID = UUID.Zero; |
1356 | 1356 | ||
@@ -1365,7 +1365,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1365 | asset.Flags = AssetFlags.Maptile; | 1365 | asset.Flags = AssetFlags.Maptile; |
1366 | 1366 | ||
1367 | // Store the new one | 1367 | // Store the new one |
1368 | m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID); | 1368 | m_log.DebugFormat("[WORLDMAP]: Storing map tile {0} for {1}", asset.ID, m_scene.RegionInfo.RegionName); |
1369 | |||
1369 | m_scene.AssetService.Store(asset); | 1370 | m_scene.AssetService.Store(asset); |
1370 | 1371 | ||
1371 | if (overlay != null) | 1372 | if (overlay != null) |