ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

changes on some robust map, connectors, map file read, etc

Browse Source
This commit is contained in:
UbitUmarov
2020-12-24 00:06:10 +00:00
parent 8c0994a367
commit d3e5b3d769
5 changed files with 79 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/Services/MapImageService/MapImageService.cs
View File

@@ -240,24 +240,24 @@ namespace OpenSim.Services.MapImageService
public byte[] GetMapTile(string fileName, UUID scopeID, out string format)
{
//m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
format = ".jpg";
string fullName = Path.Combine(m_TilesStoragePath, scopeID.ToString());
fullName = Path.Combine(fullName, fileName);
if (File.Exists(fullName))
try
{
format = Path.GetExtension(fileName).ToLower();
//m_log.DebugFormat("[MAP IMAGE SERVICE]: Found file {0}, extension {1}", fileName, format);
return File.ReadAllBytes(fullName);
}
else if (m_WaterBytes != null)
catch
{
return (byte[])m_WaterBytes.Clone();
}
else
{
//m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName);
return new byte[0];
format = ".jpg";
if (m_WaterBytes != null)
return (byte[])m_WaterBytes.Clone();
else
{
//m_log.DebugFormat("[MAP IMAGE SERVICE]: unable to get file {0}", fileName);
return new byte[0];
}
}
}