aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs2
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs (renamed from OpenSim/Region/Framework/Interfaces/IMapTileModule.cs)2
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 2e128a7..c416e88 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -2243,7 +2243,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
2243 Scene scene = null; 2243 Scene scene = null;
2244 GetSceneFromRegionParams(requestData, responseData, out scene); 2244 GetSceneFromRegionParams(requestData, responseData, out scene);
2245 2245
2246 IMapTileModule mapTileModule = scene.RequestModuleInterface<IMapTileModule>(); 2246 IMapImageUploadModule mapTileModule = scene.RequestModuleInterface<IMapImageUploadModule>();
2247 if (mapTileModule != null) 2247 if (mapTileModule != null)
2248 { 2248 {
2249 Util.FireAndForget((x) => 2249 Util.FireAndForget((x) =>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 3ed756a..2c17e0e 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
53 /// </remarks> 53 /// </remarks>
54 54
55 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")] 55 [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")]
56 public class MapImageServiceModule : ISharedRegionModule, IMapTileModule 56 public class MapImageServiceModule : ISharedRegionModule, IMapImageUploadModule
57 { 57 {
58 private static readonly ILog m_log = 58 private static readonly ILog m_log =
59 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 59 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
147 // v2 Map generation on startup is now handled by scene to allow bmp to be shared with 147 // v2 Map generation on startup is now handled by scene to allow bmp to be shared with
148 // v1 service and not generate map tiles twice as was previous behavior 148 // v1 service and not generate map tiles twice as was previous behavior
149 //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); }; 149 //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); };
150 scene.RegisterModuleInterface<IMapTileModule>(this); 150 scene.RegisterModuleInterface<IMapImageUploadModule>(this);
151 } 151 }
152 152
153 ///<summary> 153 ///<summary>
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 1bbd9fe..1f8f6b0 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
73 private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>(); 73 private Dictionary<UUID, Queue<MapBlockRequestData>> m_mapBlockRequests = new Dictionary<UUID, Queue<MapBlockRequestData>>();
74 74
75 private IMapImageGenerator m_mapImageGenerator; 75 private IMapImageGenerator m_mapImageGenerator;
76 private IMapTileModule m_mapImageServiceModule; 76 private IMapImageUploadModule m_mapImageServiceModule;
77 77
78 protected Scene m_scene; 78 protected Scene m_scene;
79 private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>(); 79 private List<MapBlockData> cachedMapBlocks = new List<MapBlockData>();
@@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
146 return; 146 return;
147 147
148 m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>(); 148 m_mapImageGenerator = m_scene.RequestModuleInterface<IMapImageGenerator>();
149 m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapTileModule>(); 149 m_mapImageServiceModule = m_scene.RequestModuleInterface<IMapImageUploadModule>();
150 } 150 }
151 151
152 152
@@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
1133 block.X = (ushort)minX; 1133 block.X = (ushort)minX;
1134 block.Y = (ushort)minY; 1134 block.Y = (ushort)minY;
1135 block.MapImageId = UUID.Zero; 1135 block.MapImageId = UUID.Zero;
1136 block.Access = (byte)SimAccess.Down; // means 'simulator is offline' 1136 block.Access = (byte)SimAccess.NonExistent;
1137 allBlocks.Add(block); 1137 allBlocks.Add(block);
1138 mapBlocks.Add(block); 1138 mapBlocks.Add(block);
1139 remoteClient.SendMapBlock(mapBlocks, flag & 0xffff); 1139 remoteClient.SendMapBlock(mapBlocks, flag & 0xffff);
diff --git a/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
index 857d923..5151567 100644
--- a/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
@@ -31,7 +31,7 @@ using System.Drawing;
31 31
32namespace OpenSim.Region.Framework.Interfaces 32namespace OpenSim.Region.Framework.Interfaces
33{ 33{
34 public interface IMapTileModule 34 public interface IMapImageUploadModule
35 { 35 {
36 /// <summary> 36 /// <summary>
37 /// Upload a new maptile 37 /// Upload a new maptile