Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
	OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs

OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs

@@ -662,11 +662,11 @@ namespace OpenSim.Framework.Servers.HttpServer
             }
             catch (IOException e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e);
+                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);
             }
             catch (Exception e)
             {
-                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}", e.StackTrace);
+                m_log.ErrorFormat("[BASE HTTP SERVER]: HandleRequest() threw {0}{1}", e.Message, e.StackTrace);
                 SendHTML500(response);
             }
             finally

OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs

@@ -151,6 +151,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
             Scene scene = (Scene)(client.Scene);
             ScenePresence presence = scene.GetScenePresence(client.AgentId);
 
+            // Round up Z co-ordinate rather than round-down by casting.  This stops tall avatars from being given
+            // a teleport Z co-ordinate by short avatars that drops them through or embeds them in thin floors on
+            // arrival.
+            //
+            // Ideally we would give the exact float position adjusting for the relative height of the two avatars
+            // but it looks like a float component isn't possible with a parcel ID.
             UUID dest = Util.BuildFakeParcelID(
                     scene.RegionInfo.RegionHandle,
                     (uint)presence.AbsolutePosition.X,

OpenSim/Region/CoreModules/World/Terrain/FileLoaders/GenericSystemDrawing.cs

@@ -59,12 +59,14 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <returns>A terrain channel generated from the image.</returns>
         public virtual ITerrainChannel LoadFile(string filename)
         {
-            return LoadBitmap(new Bitmap(filename));
+            using (Bitmap b = new Bitmap(filename))
+                return LoadBitmap(b);
         }
 
         public virtual ITerrainChannel LoadFile(string filename, int offsetX, int offsetY, int fileWidth, int fileHeight, int w, int h)
         {
-            Bitmap bitmap = new Bitmap(filename);
+            using (Bitmap bitmap = new Bitmap(filename))
+            {
                 ITerrainChannel retval = new TerrainChannel(true);
 
                 for (int x = 0; x < retval.Width; x++)
@@ -77,10 +79,12 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
                 return retval;
             }
+        }
 
         public virtual ITerrainChannel LoadStream(Stream stream)
         {
-            return LoadBitmap(new Bitmap(stream));
+            using (Bitmap b = new Bitmap(stream))
+                return LoadBitmap(b);
         }
 
         protected virtual ITerrainChannel LoadBitmap(Bitmap bitmap)
@@ -134,36 +138,54 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
             // "Saving the image to the same file it was constructed from is not allowed and throws an exception."
             string tempName = Path.GetTempFileName();
 
-            Bitmap entireBitmap = null;
+            Bitmap existingBitmap = null;
             Bitmap thisBitmap = null;
+            Bitmap newBitmap = null;
+
+            try
+            {
                 if (File.Exists(filename))
                 {
                     File.Copy(filename, tempName, true);
-                entireBitmap = new Bitmap(tempName);
+                    existingBitmap = new Bitmap(tempName);
-                if (entireBitmap.Width != fileWidth * regionSizeX || entireBitmap.Height != fileHeight * regionSizeY)
+                    if (existingBitmap.Width != fileWidth * regionSizeX || existingBitmap.Height != fileHeight * regionSizeY)
                     {
                         // old file, let's overwrite it
-                    entireBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
+                        newBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
+                    }
+                    else
+                    {
+                        newBitmap = existingBitmap;
                     }
                 }
                 else
                 {
-                entireBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
+                    newBitmap = new Bitmap(fileWidth * regionSizeX, fileHeight * regionSizeY);
                 }
     
                 thisBitmap = CreateGrayscaleBitmapFromMap(m_channel);
-//            Console.WriteLine("offsetX=" + offsetX + " offsetY=" + offsetY);
+    //            Console.WriteLine("offsetX=" + offsetX + " offsetY=" + offsetY);
                 for (int x = 0; x < regionSizeX; x++)
                     for (int y = 0; y < regionSizeY; y++)
-                    entireBitmap.SetPixel(x + offsetX * regionSizeX, y + (fileHeight - 1 - offsetY) * regionSizeY, thisBitmap.GetPixel(x, y));
+                        newBitmap.SetPixel(x + offsetX * regionSizeX, y + (fileHeight - 1 - offsetY) * regionSizeY, thisBitmap.GetPixel(x, y));
     
-            Save(entireBitmap, filename);
+                Save(newBitmap, filename);
+            }
+            finally
+            {
+                if (existingBitmap != null)
+                    existingBitmap.Dispose();
+
+                if (thisBitmap != null)
                     thisBitmap.Dispose();
-            entireBitmap.Dispose();
+
+                if (newBitmap != null)
+                    newBitmap.Dispose();
 
                 if (File.Exists(tempName))
                     File.Delete(tempName);
             }
+        }
 
         protected virtual void Save(Bitmap bmp, string filename)
         {
@@ -226,17 +248,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
         /// <returns>A System.Drawing.Bitmap containing a coloured image</returns>
         protected static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+            int pallete;
+            Bitmap bmp;
+            Color[] colours;
 
-            int pallete = gradientmapLd.Height;
+            using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
+            {
+                pallete = gradientmapLd.Height;
     
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
+                bmp = new Bitmap(map.Width, map.Height);
-            Color[] colours = new Color[pallete];
+                colours = new Color[pallete];
     
                 for (int i = 0; i < pallete; i++)
                 {
                     colours[i] = gradientmapLd.GetPixel(0, i);
                 }
+            }
 
             for (int y = 0; y < map.Height; y++)
             {

OpenSim/Region/CoreModules/World/Terrain/FileLoaders/JPEG.cs

@@ -99,17 +99,22 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders
 
         private static Bitmap CreateBitmapFromMap(ITerrainChannel map)
         {
-            Bitmap gradientmapLd = new Bitmap("defaultstripe.png");
+            int pallete;
+            Bitmap bmp;
+            Color[] colours;
 
-            int pallete = gradientmapLd.Height;
+            using (Bitmap gradientmapLd = new Bitmap("defaultstripe.png"))
+            {
+                pallete = gradientmapLd.Height;
     
-            Bitmap bmp = new Bitmap(map.Width, map.Height);
+                bmp = new Bitmap(map.Width, map.Height);
-            Color[] colours = new Color[pallete];
+                colours = new Color[pallete];
     
                 for (int i = 0; i < pallete; i++)
                 {
                     colours[i] = gradientmapLd.GetPixel(0, i);
                 }
+            }
 
             for (int y = 0; y < map.Height; y++)
             {

OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs

@@ -154,17 +154,32 @@ namespace OpenSim.Services.Connectors.Hypergrid
 
             UUID mapTile = m_HGMapImage;
             string filename = string.Empty;
-            Bitmap bitmap = null;
+
             try
             {
                 WebClient c = new WebClient();
                 //m_log.Debug("JPEG: " + imageURL);
                 string name = regionID.ToString();
                 filename = Path.Combine(storagePath, name + ".jpg");
+                m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: Map image at {0}, cached at {1}", imageURL, filename);
+                if (!File.Exists(filename))
+                {
+                    m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: downloading...");
                     c.DownloadFile(imageURL, filename);
-                bitmap = new Bitmap(filename);
+                }
+                else
+                {
+                    m_log.DebugFormat("[GATEKEEPER SERVICE CONNECTOR]: using cached image");
+                }
+
+                byte[] imageData = null;
+
+                using (Bitmap bitmap = new Bitmap(filename))
+                {
                     //m_log.Debug("Size: " + m.PhysicalDimension.Height + "-" + m.PhysicalDimension.Width);
-                byte[] imageData = OpenJPEG.EncodeFromImage(bitmap, true);
+                    imageData = OpenJPEG.EncodeFromImage(bitmap, true);
+                }
+                
                 AssetBase ass = new AssetBase(UUID.Random(), "region " + name, (sbyte)AssetType.Texture, regionID.ToString());
 
                 // !!! for now