diff options
author | UbitUmarov | 2015-09-06 01:21:20 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-06 01:21:20 +0100 |
commit | 94d13c6d226e3ca7e9f0d99da7b5cfb7d1436ce4 (patch) | |
tree | 5e018d77dda279558f948a9adfc71bf0ee543f50 | |
parent | still a missing stat ID (diff) | |
download | opensim-SC_OLD-94d13c6d226e3ca7e9f0d99da7b5cfb7d1436ce4.zip opensim-SC_OLD-94d13c6d226e3ca7e9f0d99da7b5cfb7d1436ce4.tar.gz opensim-SC_OLD-94d13c6d226e3ca7e9f0d99da7b5cfb7d1436ce4.tar.bz2 opensim-SC_OLD-94d13c6d226e3ca7e9f0d99da7b5cfb7d1436ce4.tar.xz |
dont store/upload map asset for large regions, ( needs testing)
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index adcad03..f34cfe5 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
@@ -1417,6 +1417,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1417 | if (consoleScene != null && consoleScene != m_scene) | 1417 | if (consoleScene != null && consoleScene != m_scene) |
1418 | return; | 1418 | return; |
1419 | 1419 | ||
1420 | GenerateMaptile(); | ||
1421 | } | ||
1422 | /* | ||
1420 | if (m_mapImageGenerator == null) | 1423 | if (m_mapImageGenerator == null) |
1421 | { | 1424 | { |
1422 | Console.WriteLine("No map image generator available for {0}", m_scene.Name); | 1425 | Console.WriteLine("No map image generator available for {0}", m_scene.Name); |
@@ -1430,7 +1433,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1430 | m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); | 1433 | m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); |
1431 | } | 1434 | } |
1432 | } | 1435 | } |
1433 | 1436 | */ | |
1434 | public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint) | 1437 | public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint) |
1435 | { | 1438 | { |
1436 | uint xstart = 0; | 1439 | uint xstart = 0; |
@@ -1555,12 +1558,19 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
1555 | if (m_scene.Heightmap == null) | 1558 | if (m_scene.Heightmap == null) |
1556 | return; | 1559 | return; |
1557 | 1560 | ||
1561 | if (m_mapImageGenerator == null) | ||
1562 | { | ||
1563 | Console.WriteLine("No map image generator available for {0}", m_scene.Name); | ||
1564 | return; | ||
1565 | } | ||
1558 | m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name); | 1566 | m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name); |
1559 | 1567 | ||
1560 | using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) | 1568 | using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) |
1561 | { | 1569 | { |
1562 | // V1 (This Module) | 1570 | // V1 (This Module) |
1563 | GenerateMaptile(mapbmp); | 1571 | if(m_scene.RegionInfo.RegionSizeX <= Constants.RegionSize && |
1572 | m_scene.RegionInfo.RegionSizeY <= Constants.RegionSize) | ||
1573 | GenerateMaptile(mapbmp); | ||
1564 | 1574 | ||
1565 | // v2/3 (MapImageServiceModule) | 1575 | // v2/3 (MapImageServiceModule) |
1566 | if(m_mapImageServiceModule !=null) | 1576 | if(m_mapImageServiceModule !=null) |