diff options
author | BlueWall | 2012-03-02 15:02:09 -0500 |
---|---|---|
committer | BlueWall | 2012-03-02 15:02:09 -0500 |
commit | 6fc350725da5132eefe14897644d672ce586c5db (patch) | |
tree | d73af5d1d9bc61143fbac24a4dd54256a1394c97 /OpenSim/Region/CoreModules/World | |
parent | Merge branch 'master' of /home/opensim/src/opensim into v3_support (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.zip opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.gz opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.bz2 opensim-SC_OLD-6fc350725da5132eefe14897644d672ce586c5db.tar.xz |
Merge branch 'master' into v3_support
Diffstat (limited to 'OpenSim/Region/CoreModules/World')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 74b047b..fd122da 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
132 | { | 132 | { |
133 | } | 133 | } |
134 | 134 | ||
135 | public Type ReplaceableInterface | 135 | public Type ReplaceableInterface |
136 | { | 136 | { |
137 | get { return null; } | 137 | get { return null; } |
138 | } | 138 | } |
@@ -220,7 +220,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
220 | // There is a major hack going on in this method. The viewer doesn't request | 220 | // There is a major hack going on in this method. The viewer doesn't request |
221 | // map blocks (RequestMapBlocks) above 2048. That means that if we don't hack, | 221 | // map blocks (RequestMapBlocks) above 2048. That means that if we don't hack, |
222 | // grids above that cell don't have a map at all. So, here's the hack: we wait | 222 | // grids above that cell don't have a map at all. So, here's the hack: we wait |
223 | // for this CAP request to come, and we inject the map blocks at this point. | 223 | // for this CAP request to come, and we inject the map blocks at this point. |
224 | // In a normal scenario, this request simply sends back the MapLayer (the blue color). | 224 | // In a normal scenario, this request simply sends back the MapLayer (the blue color). |
225 | // In the hacked scenario, it also sends the map blocks via UDP. | 225 | // In the hacked scenario, it also sends the map blocks via UDP. |
226 | // | 226 | // |
@@ -751,7 +751,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
751 | { | 751 | { |
752 | uint x = 0, y = 0; | 752 | uint x = 0, y = 0; |
753 | Utils.LongToUInts(regionhandle, out x, out y); | 753 | Utils.LongToUInts(regionhandle, out x, out y); |
754 | GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); | 754 | GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); |
755 | 755 | ||
756 | if (mreg != null) | 756 | if (mreg != null) |
757 | { | 757 | { |
@@ -857,7 +857,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
857 | finally | 857 | finally |
858 | { | 858 | { |
859 | if (os != null) | 859 | if (os != null) |
860 | os.Close(); | 860 | os.Close(); |
861 | } | 861 | } |
862 | 862 | ||
863 | string response_mapItems_reply = null; | 863 | string response_mapItems_reply = null; |
@@ -960,16 +960,16 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
960 | // on an unloaded square. | 960 | // on an unloaded square. |
961 | // But make sure: Look whether the one we requested is in there | 961 | // But make sure: Look whether the one we requested is in there |
962 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 962 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
963 | minX * (int)Constants.RegionSize, | 963 | minX * (int)Constants.RegionSize, |
964 | maxX * (int)Constants.RegionSize, | 964 | maxX * (int)Constants.RegionSize, |
965 | minY * (int)Constants.RegionSize, | 965 | minY * (int)Constants.RegionSize, |
966 | maxY * (int)Constants.RegionSize); | 966 | maxY * (int)Constants.RegionSize); |
967 | 967 | ||
968 | if (regions != null) | 968 | if (regions != null) |
969 | { | 969 | { |
970 | foreach (GridRegion r in regions) | 970 | foreach (GridRegion r in regions) |
971 | { | 971 | { |
972 | if ((r.RegionLocX == minX * (int)Constants.RegionSize) && | 972 | if ((r.RegionLocX == minX * (int)Constants.RegionSize) && |
973 | (r.RegionLocY == minY * (int)Constants.RegionSize)) | 973 | (r.RegionLocY == minY * (int)Constants.RegionSize)) |
974 | { | 974 | { |
975 | // found it => add it to response | 975 | // found it => add it to response |
@@ -1004,7 +1004,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1004 | { | 1004 | { |
1005 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); | 1005 | List<MapBlockData> mapBlocks = new List<MapBlockData>(); |
1006 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, | 1006 | List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, |
1007 | (minX - 4) * (int)Constants.RegionSize, | 1007 | (minX - 4) * (int)Constants.RegionSize, |
1008 | (maxX + 4) * (int)Constants.RegionSize, | 1008 | (maxX + 4) * (int)Constants.RegionSize, |
1009 | (minY - 4) * (int)Constants.RegionSize, | 1009 | (minY - 4) * (int)Constants.RegionSize, |
1010 | (maxY + 4) * (int)Constants.RegionSize); | 1010 | (maxY + 4) * (int)Constants.RegionSize); |
@@ -1336,7 +1336,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1336 | // Cannot create a map for a nonexistant heightmap | 1336 | // Cannot create a map for a nonexistant heightmap |
1337 | if (m_scene.Heightmap == null) | 1337 | if (m_scene.Heightmap == null) |
1338 | return; | 1338 | return; |
1339 | 1339 | ||
1340 | //create a texture asset of the terrain | 1340 | //create a texture asset of the terrain |
1341 | IMapImageGenerator terrain = m_scene.RequestModuleInterface<IMapImageGenerator>(); | 1341 | IMapImageGenerator terrain = m_scene.RequestModuleInterface<IMapImageGenerator>(); |
1342 | if (terrain == null) | 1342 | if (terrain == null) |
@@ -1345,7 +1345,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1345 | byte[] data = terrain.WriteJpeg2000Image(); | 1345 | byte[] data = terrain.WriteJpeg2000Image(); |
1346 | if (data == null) | 1346 | if (data == null) |
1347 | return; | 1347 | return; |
1348 | 1348 | ||
1349 | byte[] overlay = GenerateOverlay(); | 1349 | byte[] overlay = GenerateOverlay(); |
1350 | 1350 | ||
1351 | m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE"); | 1351 | m_log.Debug("[WORLDMAP]: STORING MAPTILE IMAGE"); |
@@ -1366,7 +1366,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1366 | // Store the new one | 1366 | // Store the new one |
1367 | m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID); | 1367 | m_log.DebugFormat("[WORLDMAP]: Storing map tile {0}", asset.ID); |
1368 | m_scene.AssetService.Store(asset); | 1368 | m_scene.AssetService.Store(asset); |
1369 | 1369 | ||
1370 | if (overlay != null) | 1370 | if (overlay != null) |
1371 | { | 1371 | { |
1372 | parcelImageID = UUID.Random(); | 1372 | parcelImageID = UUID.Random(); |
@@ -1390,7 +1390,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1390 | m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID; | 1390 | m_scene.RegionInfo.RegionSettings.TerrainImageID = terrainImageID; |
1391 | m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID; | 1391 | m_scene.RegionInfo.RegionSettings.ParcelImageID = parcelImageID; |
1392 | m_scene.RegionInfo.RegionSettings.Save(); | 1392 | m_scene.RegionInfo.RegionSettings.Save(); |
1393 | 1393 | ||
1394 | // Delete the old one | 1394 | // Delete the old one |
1395 | // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID); | 1395 | // m_log.DebugFormat("[WORLDMAP]: Deleting old map tile {0}", lastTerrainImageID); |
1396 | m_scene.AssetService.Delete(lastTerrainImageID.ToString()); | 1396 | m_scene.AssetService.Delete(lastTerrainImageID.ToString()); |
@@ -1469,18 +1469,18 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1469 | if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0) | 1469 | if ((land.LandData.Flags & (uint)ParcelFlags.ForSale) != 0) |
1470 | { | 1470 | { |
1471 | landForSale = true; | 1471 | landForSale = true; |
1472 | 1472 | ||
1473 | saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap()); | 1473 | saleBitmap = land.MergeLandBitmaps(saleBitmap, land.GetLandBitmap()); |
1474 | } | 1474 | } |
1475 | } | 1475 | } |
1476 | 1476 | ||
1477 | if (!landForSale) | 1477 | if (!landForSale) |
1478 | { | 1478 | { |
1479 | m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not geenrating overlay", m_scene.RegionInfo.RegionName); | 1479 | m_log.DebugFormat("[WORLD MAP]: Region {0} has no parcels for sale, not generating overlay", m_scene.RegionInfo.RegionName); |
1480 | return null; | 1480 | return null; |
1481 | } | 1481 | } |
1482 | 1482 | ||
1483 | m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, genrating overlay", m_scene.RegionInfo.RegionName); | 1483 | m_log.DebugFormat("[WORLD MAP]: Region {0} has parcels for sale, generating overlay", m_scene.RegionInfo.RegionName); |
1484 | 1484 | ||
1485 | for (int x = 0 ; x < 64 ; x++) | 1485 | for (int x = 0 ; x < 64 ; x++) |
1486 | { | 1486 | { |