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

rename ImapTileModule as IMAPImageUploadModule to match core

avinationmerge
UbitUmarov 2015-08-24 11:06:12 +01:00
parent 018d855f28
commit cbc569a1e0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -2243,7 +2243,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
Scene scene = null; Scene scene = null;
GetSceneFromRegionParams(requestData, responseData, out scene); GetSceneFromRegionParams(requestData, responseData, out scene);
IMapTileModule mapTileModule = scene.RequestModuleInterface<IMapTileModule>(); IMapImageUploadModule mapTileModule = scene.RequestModuleInterface<IMapImageUploadModule>();
if (mapTileModule != null) if (mapTileModule != null)
{ {
Util.FireAndForget((x) => Util.FireAndForget((x) =>

4
OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
/// </remarks> /// </remarks>
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")]
public class MapImageServiceModule : ISharedRegionModule, IMapTileModule public class MapImageServiceModule : ISharedRegionModule, IMapImageUploadModule
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
// v2 Map generation on startup is now handled by scene to allow bmp to be shared with // v2 Map generation on startup is now handled by scene to allow bmp to be shared with
// v1 service and not generate map tiles twice as was previous behavior // v1 service and not generate map tiles twice as was previous behavior
//scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); }; //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
scene.RegisterModuleInterface<IMapTileModule>(this); scene.RegisterModuleInterface<IMapImageUploadModule>(this);
} }
///<summary> ///<summary>

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

@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>(); private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
private IMapImageGenerator m_mapImageGenerator; private IMapImageGenerator m_mapImageGenerator;
private IMapTileModule m_mapImageServiceModule; private IMapImageUploadModule m_mapImageServiceModule;
protected Scene m_scene; protected Scene m_scene;
private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>(); private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
return; return;
m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>(); m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapTileModule>(); m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
} }
@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
block.X = (ushort)minX; block.X = (ushort)minX;
block.Y = (ushort)minY; block.Y = (ushort)minY;
block.MapImageId = UUID.Zero; block.MapImageId = UUID.Zero;
block.Access = (byte)SimAccess.Down; // means 'simulator is offline' block.Access = (byte)SimAccess.NonExistent;
allBlocks.Add(block); allBlocks.Add(block);
mapBlocks.Add(block); mapBlocks.Add(block);
remoteClient.SendMapBlock(mapBlocks, flag & 0xffff); remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);

2
OpenSim/Region/Framework/Interfaces/IMapTileModule.cs → OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
View File

@ -31,7 +31,7 @@ using System.Drawing;
namespace OpenSim.Region.Framework.Interfaces namespace OpenSim.Region.Framework.Interfaces
{ {
public interface IMapTileModule public interface IMapImageUploadModule
{ {
/// <summary> /// <summary>
/// Upload a new maptile /// Upload a new maptile