From 01ae916bad672722aa62ee712b7b580d6f5f4370 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 19 Nov 2011 00:07:34 +0000
Subject: Don't register a region twice on both official registration and
maptile regeneration.
Maptile storage appears orthogonal to region registration
---
OpenSim/Region/Framework/Scenes/Scene.cs | 12 +++++-------
.../Services/Connectors/MapImage/MapImageServiceConnector.cs | 4 +++-
OpenSim/Services/GridService/GridService.cs | 1 +
OpenSim/Services/MapImageService/MapImageService.cs | 2 ++
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
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 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
}
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 05cfe5f..768e4e1 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 7e7391c..83727b6 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))
--
cgit v1.1