aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs12
-rw-r--r--OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs4
-rw-r--r--OpenSim/Services/GridService/GridService.cs1
-rw-r--r--OpenSim/Services/MapImageService/MapImageService.cs2
4 files changed, 11 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f10789b..47450ed 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -5017,18 +5017,16 @@ namespace OpenSim.Region.Framework.Scenes
5017 return offsets.ToArray(); 5017 return offsets.ToArray();
5018 } 5018 }
5019 5019
5020 /// <summary>
5021 /// Regenerate the maptile for this scene.
5022 /// </summary>
5023 /// <param name="sender"></param>
5024 /// <param name="e"></param>
5020 public void RegenerateMaptile(object sender, ElapsedEventArgs e) 5025 public void RegenerateMaptile(object sender, ElapsedEventArgs e)
5021 { 5026 {
5022 IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>(); 5027 IWorldMapModule mapModule = RequestModuleInterface<IWorldMapModule>();
5023 if (mapModule != null) 5028 if (mapModule != null)
5024 {
5025 mapModule.GenerateMaptile(); 5029 mapModule.GenerateMaptile();
5026
5027 string error = GridService.RegisterRegion(RegionInfo.ScopeID, new GridRegion(RegionInfo));
5028
5029 if (error != String.Empty)
5030 throw new Exception(error);
5031 }
5032 } 5030 }
5033 5031
5034 // This method is called across the simulation connector to 5032 // 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 69e2d17..e46714e 100644
--- a/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
+++ b/OpenSim/Services/Connectors/MapImage/MapImageServiceConnector.cs
@@ -129,7 +129,9 @@ namespace OpenSim.Services.Connectors
129 129
130 } 130 }
131 else 131 else
132 m_log.DebugFormat("[MAP IMAGE CONNECTOR]: RegisterRegion received null reply"); 132 {
133 m_log.DebugFormat("[MAP IMAGE CONNECTOR]: Map post received null reply");
134 }
133 } 135 }
134 catch (Exception e) 136 catch (Exception e)
135 { 137 {
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 05cfe5f..768e4e1 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -156,6 +156,7 @@ namespace OpenSim.Services.GridService
156 regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); 156 regionInfos.RegionID, regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
157 return "Region overlaps another region"; 157 return "Region overlaps another region";
158 } 158 }
159
159 if ((region != null) && (region.RegionID == regionInfos.RegionID) && 160 if ((region != null) && (region.RegionID == regionInfos.RegionID) &&
160 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY))) 161 ((region.posX != regionInfos.RegionLocX) || (region.posY != regionInfos.RegionLocY)))
161 { 162 {
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 7e7391c..83727b6 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -138,6 +138,8 @@ namespace OpenSim.Services.MapImageService
138 138
139 public byte[] GetMapTile(string fileName, out string format) 139 public byte[] GetMapTile(string fileName, out string format)
140 { 140 {
141// m_log.DebugFormat("[MAP IMAGE SERVICE]: Getting map tile {0}", fileName);
142
141 format = ".jpg"; 143 format = ".jpg";
142 string fullName = Path.Combine(m_TilesStoragePath, fileName); 144 string fullName = Path.Combine(m_TilesStoragePath, fileName);
143 if (File.Exists(fullName)) 145 if (File.Exists(fullName))