From 694c8ab588b1d9a94c1cdba5e05ef4e0492f0354 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 11 Jun 2010 22:08:43 +0100
Subject: Remove the lastmap stuff from the map module, also remove a bunch of
 comments that no longer reflect actual conditions

---
 .../CoreModules/World/WorldMap/WorldMapModule.cs   | 28 +---------------------
 1 file changed, 1 insertion(+), 27 deletions(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index c6fb18d..0e849e5 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -1002,41 +1002,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
 
         public void RegenerateMaptile(byte[] data)
         {
-            // Overwrites the local Asset cache with new maptile data
-            // Assets are single write, this causes the asset server to ignore this update,
-            // but the local asset cache does not
-
-            // this is on purpose!  The net result of this is the region always has the most up to date
-            // map tile while protecting the (grid) asset database from bloat caused by a new asset each
-            // time a mapimage is generated!
-
             UUID lastMapRegionUUID = m_scene.RegionInfo.RegionSettings.TerrainImageID;
 
-            int lastMapRefresh = 0;
-            int twoDays = 172800;
-//            int RefreshSeconds = twoDays;
-
-            try
-            {
-                lastMapRefresh = Convert.ToInt32(m_scene.RegionInfo.lastMapRefresh);
-            }
-            catch (ArgumentException)
-            {
-            }
-            catch (FormatException)
-            {
-            }
-            catch (OverflowException)
-            {
-            }
-
             m_log.Debug("[MAPTILE]: STORING MAPTILE IMAGE");
 
             m_scene.RegionInfo.RegionSettings.TerrainImageID = UUID.Random();
 
             AssetBase asset = new AssetBase(
                 m_scene.RegionInfo.RegionSettings.TerrainImageID,
-                "terrainImage_" + m_scene.RegionInfo.RegionID.ToString() + "_" + lastMapRefresh.ToString(),
+                "terrainImage_" + m_scene.RegionInfo.RegionID.ToString(),
                 (sbyte)AssetType.Texture,
                 m_scene.RegionInfo.RegionID.ToString());
             asset.Data = data;
-- 
cgit v1.1