diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index f10789be0a..47450ed725 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs @@ -5017,18 +5017,16 @@ namespace OpenSim.Region.Framework.Scenes return offsets.ToArray(); } + /// + /// Regenerate the maptile for this scene. + /// + /// + /// public void RegenerateMaptile(object sender, ElapsedEventArgs e) { IWorldMapModule mapModule = RequestModuleInterface(); if (mapModule != null) - { mapModule.GenerateMaptile(); - - string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo)); - - if (error != String.Empty) - throw new Exception(error); - } } // This method is called across the simulation connector to diff --git a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs index 69e2d17949..e46714ec53 100644 --- a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs +++ b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs @@ -129,7 +129,9 @@ namespace OpenSim.Services.Connectors } else - m_log.DebugFormat("[MAP IMAGE CONNECTOR]: RegisterRegion received null reply"); + { + m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply"); + } } catch (Exception e) { diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 05cfe5fd3a..768e4e1a4d 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs @@ -156,6 +156,7 @@ namespace OpenSim.Services.GridService regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); return "Region overlaps another region"; } + if ((region != null) && (region.RegionID == regionInfos.RegionID) && ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) { diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index 7e7391c988..83727b6727 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs @@ -138,6 +138,8 @@ namespace OpenSim.Services.MapImageService public byte[] GetMapTile(string fileName, out string format) { +// m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName); + format = ".jpg"; string fullName = Path.Combine(m_TilesStoragePath, fileName); if (File.Exists(fullName))