2 files changed, 74 insertions, 1 deletions

diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 2db1d14..fcace3a 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -54,6 +54,9 @@ namespace OpenSim.Services.MapImageService
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
+#pragma warning disable 414
+        private string LogHeader = "[MAP IMAGE SERVICE]";
+#pragma warning restore 414
 
         private const int ZOOM_LEVELS = 8;
         private const int IMAGE_WIDTH = 256;
@@ -128,6 +131,16 @@ namespace OpenSim.Services.MapImageService
                     return false;
                 }
             }
+<<<<<<< HEAD
+
+            return UpdateMultiResolutionFilesAsync(x, y, out reason);
+        }
+
+        public bool RemoveMapTile(int x, int y, out string reason)
+        {
+            reason = String.Empty;
+            string fileName = GetFileName(1, x, y);
+=======
 
             return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
         }
@@ -136,24 +149,40 @@ namespace OpenSim.Services.MapImageService
         {
             reason = String.Empty;
             string fileName = GetFileName(1, x, y, scopeID);
+>>>>>>> avn/ubitvar
 
             lock (m_Sync)
             {
                 try
+<<<<<<< HEAD
                 {
                     File.Delete(fileName);
                 }
                 catch (Exception e)
                 {
+=======
+                {
+                    File.Delete(fileName);
+                }
+                catch (Exception e)
+                {
+>>>>>>> avn/ubitvar
                     m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to save delete file {0}: {1}", fileName, e);
                     reason = e.Message;
                     return false;
                 }
             }
+<<<<<<< HEAD
+
+            return UpdateMultiResolutionFilesAsync(x, y, out reason);
+        }
+
+=======
 
             return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
         }
 
+>>>>>>> avn/ubitvar
         // When large varregions start up, they can send piles of new map tiles. This causes
         //    this multi-resolution routine to be called a zillion times an causes much CPU
         //    time to be spent creating multi-resolution tiles that will be replaced when
@@ -162,6 +191,25 @@ namespace OpenSim.Services.MapImageService
         {
             public int xx;
             public int yy;
+<<<<<<< HEAD
+            public mapToMultiRez(int pX, int pY)
+            {
+                xx = pX;
+                yy = pY;
+            }
+        };
+        private Queue<mapToMultiRez> multiRezToBuild = new Queue<mapToMultiRez>();
+        private bool UpdateMultiResolutionFilesAsync(int x, int y, out string reason)
+        {
+            reason = String.Empty;
+            lock (multiRezToBuild)
+            {
+                // m_log.DebugFormat("{0} UpdateMultiResolutionFilesAsync: scheduling update for <{1},{2}>", LogHeader, x, y);
+                multiRezToBuild.Enqueue(new mapToMultiRez(x, y));
+                if (multiRezToBuild.Count == 1)
+                    Util.FireAndForget(
+                        DoUpdateMultiResolutionFilesAsync, null, "MapImageService.DoUpdateMultiResolutionFilesAsync");
+=======
             public UUID scopeID;
             public mapToMultiRez(int pX, int pY, UUID pscopeID)
             {
@@ -183,6 +231,7 @@ namespace OpenSim.Services.MapImageService
                 if (multiRezToBuild.Count == 1)
                     Util.FireAndForget(
                         DoUpdateMultiResolutionFilesAsync);
+>>>>>>> avn/ubitvar
             }
 
             return true;
@@ -190,8 +239,15 @@ namespace OpenSim.Services.MapImageService
 
         private void DoUpdateMultiResolutionFilesAsync(object o)
         {
+<<<<<<< HEAD
+            // This sleep causes the FireAndForget thread to be different than the invocation thread.
+            // It also allows other tiles to be uploaded so the multi-rez images are more likely
+            //     to be correct.
+            Thread.Sleep(1 * 1000);
+=======
             // let acumulate large region tiles
             Thread.Sleep(60 * 1000); // large regions take time to upload tiles
+>>>>>>> avn/ubitvar
 
             while (multiRezToBuild.Count > 0)
             {
@@ -205,22 +261,35 @@ namespace OpenSim.Services.MapImageService
                 {
                     int x = toMultiRez.xx;
                     int y = toMultiRez.yy;
+<<<<<<< HEAD
+                    // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y);
+
+=======
                     UUID scopeID = toMultiRez.scopeID;
                     // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y);
 
                     int width = 1;
+>>>>>>> avn/ubitvar
                     // Stitch seven more aggregate tiles together
                     for (uint zoomLevel = 2; zoomLevel <= ZOOM_LEVELS; zoomLevel++)
                     {
                         // Calculate the width (in full resolution tiles) and bottom-left
                         // corner of the current zoom level
+<<<<<<< HEAD
+                        int width = (int)Math.Pow(2, (double)(zoomLevel - 1));
+=======
                         width *= 2;
+>>>>>>> avn/ubitvar
                         int x1 = x - (x % width);
                         int y1 = y - (y % width);
 
                         lock (m_Sync)   // must lock the reading and writing of the maptile files
                         {
+<<<<<<< HEAD
+                            if (!CreateTile(zoomLevel, x1, y1))
+=======
                             if (!CreateTile(zoomLevel, x1, y1, scopeID))
+>>>>>>> avn/ubitvar
                             {
                                 m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0},{1} at zoom level {1}", x, y, zoomLevel);
                                 return;
@@ -229,6 +298,10 @@ namespace OpenSim.Services.MapImageService
                     }
                 }
             }
+<<<<<<< HEAD
+
+=======
+>>>>>>> avn/ubitvar
             return;
         }
 
diff --git a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
index edadb26..e5f1bf9 100644
--- a/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
+++ b/OpenSim/Services/MapImageService/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("0.8.0.*")]
+[assembly: AssemblyVersion("0.8.2.*")]