From cbc569a1e0cd26b991bed27245f07946cdbec4b7 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 24 Aug 2015 11:06:12 +0100 Subject: rename ImapTileModule as IMAPImageUploadModule to match core --- .../RemoteController/RemoteAdminPlugin.cs | 2 +- .../MapImage/MapImageServiceModule.cs | 4 +-- .../CoreModules/World/WorldMap/WorldMapModule.cs | 6 ++-- .../Framework/Interfaces/IMapImageUploadModule.cs | 42 ++++++++++++++++++++++ .../Region/Framework/Interfaces/IMapTileModule.cs | 42 ---------------------- 5 files changed, 48 insertions(+), 48 deletions(-) create mode 100644 OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs delete mode 100644 OpenSim/Region/Framework/Interfaces/IMapTileModule.cs 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 Scene scene = null; GetSceneFromRegionParams(requestData, responseData, out scene); - IMapTileModule mapTileModule = scene.RequestModuleInterface(); + IMapImageUploadModule mapTileModule = scene.RequestModuleInterface(); if (mapTileModule != null) { 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 /// [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "MapImageServiceModule")] - public class MapImageServiceModule : ISharedRegionModule, IMapTileModule + public class MapImageServiceModule : ISharedRegionModule, IMapImageUploadModule { private static readonly ILog m_log = 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 // v1 service and not generate map tiles twice as was previous behavior //scene.EventManager.OnRegionReadyStatusChange += s => { if (s.Ready) UploadMapTile(s); }; - scene.RegisterModuleInterface(this); + scene.RegisterModuleInterface(this); } /// 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 private Dictionary> m_mapBlockRequests = new Dictionary>(); private IMapImageGenerator m_mapImageGenerator; - private IMapTileModule m_mapImageServiceModule; + private IMapImageUploadModule m_mapImageServiceModule; protected Scene m_scene; private List cachedMapBlocks = new List(); @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap return; m_mapImageGenerator = m_scene.RequestModuleInterface(); - m_mapImageServiceModule = m_scene.RequestModuleInterface(); + m_mapImageServiceModule = m_scene.RequestModuleInterface(); } @@ -1133,7 +1133,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap block.X = (ushort)minX; block.Y = (ushort)minY; block.MapImageId = UUID.Zero; - block.Access = (byte)SimAccess.Down; // means 'simulator is offline' + block.Access = (byte)SimAccess.NonExistent; allBlocks.Add(block); mapBlocks.Add(block); remoteClient.SendMapBlock(mapBlocks, flag & 0xffff); diff --git a/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs new file mode 100644 index 0000000..5151567 --- /dev/null +++ b/OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs @@ -0,0 +1,42 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using OpenMetaverse; +using OpenSim.Framework; +using System.Drawing; + +namespace OpenSim.Region.Framework.Interfaces +{ + public interface IMapImageUploadModule + { + /// + /// Upload a new maptile + /// + void UploadMapTile(IScene scene); + void UploadMapTile(IScene scene, Bitmap mapTile); + } +} diff --git a/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs b/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs deleted file mode 100644 index 857d923..0000000 --- a/OpenSim/Region/Framework/Interfaces/IMapTileModule.cs +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using OpenMetaverse; -using OpenSim.Framework; -using System.Drawing; - -namespace OpenSim.Region.Framework.Interfaces -{ - public interface IMapTileModule - { - /// - /// Upload a new maptile - /// - void UploadMapTile(IScene scene); - void UploadMapTile(IScene scene, Bitmap mapTile); - } -} -- cgit v1.1