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

A few bug fixes on map V2. Zoom level weirdness still there.

bulletsim
Diva Canto 2011-06-12 17:05:45 -07:00
parent fd57c91b4a
commit 78c16da544
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -836,7 +836,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
block.Access = 254; // means 'simulator is offline'
response.Add(block);
}
remoteClient.SendMapBlock(response, 0);
if ((flag & 2) == 2) // V2 !!!
remoteClient.SendMapBlock(response, 2);
else
remoteClient.SendMapBlock(response, 0);
}
else
{
@ -849,17 +852,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{
List<MapBlockData> mapBlocks = new List<MapBlockData>();
List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
(minX - 8) * (int)Constants.RegionSize,
(maxX + 8) * (int)Constants.RegionSize,
(minY - 8) * (int)Constants.RegionSize,
(maxY + 8) * (int)Constants.RegionSize);
(minX - 4) * (int)Constants.RegionSize,
(maxX + 4) * (int)Constants.RegionSize,
(minY - 4) * (int)Constants.RegionSize,
(maxY + 4) * (int)Constants.RegionSize);
foreach (GridRegion r in regions)
{
MapBlockData block = new MapBlockData();
MapBlockFromGridRegion(block, r);
mapBlocks.Add(block);
}
remoteClient.SendMapBlock(mapBlocks, 0);
if ((flag & 2) == 2) // V2 !!!
remoteClient.SendMapBlock(mapBlocks, 2);
else
remoteClient.SendMapBlock(mapBlocks, 0);
return mapBlocks;
}

5
OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
View File

@ -83,13 +83,12 @@ namespace OpenSim.Server.Handlers.MapImage
string format = string.Empty;
result = m_MapService.GetMapTile(path.Trim('/'), out format);
if (result.Length > 0)
{
httpResponse.StatusCode = (int)HttpStatusCode.OK;
if (format.Equals("png"))
if (format.Equals(".png"))
httpResponse.ContentType = "image/png";
else if (format.Equals("jpg") || format.Equals("jpeg"))
else if (format.Equals(".jpg") || format.Equals(".jpeg"))
httpResponse.ContentType = "image/jpeg";
}
else

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

@ -134,7 +134,7 @@ namespace OpenSim.Services.MapImageService
public byte[] GetMapTile(string fileName, out string format)
{
format = "jpg";
format = ".jpg";
string fullName = Path.Combine(m_TilesStoragePath, fileName);
if (File.Exists(fullName))
{