OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dont store/upload map asset for large regions, ( needs testing)

avinationmerge
UbitUmarov 2015-09-06 01:21:20 +01:00
parent c1a4786be0
commit 94d13c6d22
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@ -1417,6 +1417,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (consoleScene != null && consoleScene != m_scene) if (consoleScene != null && consoleScene != m_scene)
return; return;
GenerateMaptile();
}
/*
if (m_mapImageGenerator == null) if (m_mapImageGenerator == null)
{ {
Console.WriteLine("No map image generator available for {0}", m_scene.Name); Console.WriteLine("No map image generator available for {0}", m_scene.Name);
@ -1430,7 +1433,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp); m_mapImageServiceModule.UploadMapTile(m_scene, mapbmp);
} }
} }
*/
public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint) public OSD HandleRemoteMapItemRequest(string path, OSD request, string endpoint)
{ {
uint xstart = 0; uint xstart = 0;
@ -1555,11 +1558,18 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (m_scene.Heightmap == null) if (m_scene.Heightmap == null)
return; return;
if (m_mapImageGenerator == null)
{
Console.WriteLine("No map image generator available for {0}", m_scene.Name);
return;
}
m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name); m_log.DebugFormat("[WORLD MAP]: Generating map image for {0}", m_scene.Name);
using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile()) using (Bitmap mapbmp = m_mapImageGenerator.CreateMapTile())
{ {
// V1 (This Module) // V1 (This Module)
if(m_scene.RegionInfo.RegionSizeX <= Constants.RegionSize &&
m_scene.RegionInfo.RegionSizeY <= Constants.RegionSize)
GenerateMaptile(mapbmp); GenerateMaptile(mapbmp);
// v2/3 (MapImageServiceModule) // v2/3 (MapImageServiceModule)