diff options
author | Melanie | 2012-01-30 21:24:21 +0000 |
---|---|---|
committer | Melanie | 2012-01-30 21:24:21 +0000 |
commit | 53c3faac5d3102cf9bd7d348acaac9a07804f382 (patch) | |
tree | 0e17c4b74c89e0ca419198a54b45d91b000a69f2 /OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |
parent | Add the needed column in the regions table and a few tweaks. (diff) | |
download | opensim-SC_OLD-53c3faac5d3102cf9bd7d348acaac9a07804f382.zip opensim-SC_OLD-53c3faac5d3102cf9bd7d348acaac9a07804f382.tar.gz opensim-SC_OLD-53c3faac5d3102cf9bd7d348acaac9a07804f382.tar.bz2 opensim-SC_OLD-53c3faac5d3102cf9bd7d348acaac9a07804f382.tar.xz |
Patch in the rest of the maptile stuff
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index c81eeeb..ac95598 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1348,6 +1348,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1348 | m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE"); | 1348 | m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE"); |
1349 | 1349 | ||
1350 | UUID terrainImageID = UUID.Random(); | 1350 | UUID terrainImageID = UUID.Random(); |
1351 | UUID parcelImageID = UUID.Zero; // UUID.Random(); | ||
1351 | 1352 | ||
1352 | AssetBase asset = new AssetBase( | 1353 | AssetBase asset = new AssetBase( |
1353 | terrainImageID, | 1354 | terrainImageID, |
@@ -1364,13 +1365,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1364 | m_scene.AssetService.Store(asset); | 1365 | m_scene.AssetService.Store(asset); |
1365 | 1366 | ||
1366 | // Switch to the new one | 1367 | // Switch to the new one |
1367 | UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID; | 1368 | UUID lastTerrainImageID = m_scene.RegionInfo.RegionSettings.TerrainImageID; |
1369 | UUID lastParcelImageID = m_scene.RegionInfo.RegionSettings.TerrainImageID; | ||
1368 | m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID; | 1370 | m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID; |
1371 | m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID; | ||
1369 | m_scene.RegionInfo.RegionSettings.Save(); | 1372 | m_scene.RegionInfo.RegionSettings.Save(); |
1370 | 1373 | ||
1371 | // Delete the old one | 1374 | // Delete the old one |
1372 | m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastMapRegionUUID); | 1375 | // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID); |
1373 | m_scene.AssetService.Delete(lastMapRegionUUID.ToString()); | 1376 | m_scene.AssetService.Delete(lastTerrainImageID.ToString()); |
1377 | m_scene.AssetService.Delete(lastParcelImageID.ToString()); | ||
1374 | } | 1378 | } |
1375 | 1379 | ||
1376 | private void MakeRootAgent(ScenePresence avatar) | 1380 | private void MakeRootAgent(ScenePresence avatar) |