seems to compile ( tests comented out)

2 files changed, 0 insertions, 26 deletions

diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index a228e7a..5155804 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -104,7 +104,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
                     terrainRenderer.Initialise(m_scene, m_config);
 
-<<<<<<< HEAD
                     mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height,
                                             System.Drawing.Imaging.PixelFormat.Format24bppRgb);
                     //long t = System.Environment.TickCount;
@@ -113,17 +112,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
                     //}
                     //t = System.Environment.TickCount - t;
                     //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
-=======
-                mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height,
-                                        System.Drawing.Imaging.PixelFormat.Format24bppRgb);
-                //long t = System.Environment.TickCount;
-                //for (int i = 0; i < 10; ++i) {
-                terrainRenderer.TerrainToBitmap(mapbmp);
-                //}
-                //t = System.Environment.TickCount - t;
-                //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t);
->>>>>>> avn/ubitvar
-
                     if (drawPrimVolume)
                     {
                         DrawObjectVolume(m_scene, mapbmp);
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
index a9cc993..0ec2053 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
@@ -270,14 +270,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
 
         // the heigthfield might have some jumps in values. Rendered land is smooth, though,
         // as a slope is rendered at that place. So average 4 neighbour values to emulate that.
-<<<<<<< HEAD
         private float getHeight(ITerrainChannel hm, int x, int y) {
             if (x < (hm.Width - 1) && y < (hm.Height - 1))
-=======
-        private float getHeight(ITerrainChannel hm, int x, int y)
-        {
-            if (x < ((int)Constants.RegionSize - 1) && y < ((int)Constants.RegionSize - 1))
->>>>>>> avn/ubitvar
                 return (float)(hm[x, y] * .444 + (hm[x + 1, y] + hm[x, y + 1]) * .222 + hm[x + 1, y +1] * .112);
             else
                 return (float)hm[x, y];
@@ -294,14 +288,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             if (mapbmp.Width != hm.Width || mapbmp.Height != hm.Height)
             {
                 m_log.ErrorFormat("{0} TerrainToBitmap. Passed bitmap wrong dimensions. passed=<{1},{2}>, size=<{3},{4}>",
-                    LogHeader, mapbmp.Width, mapbmp.Height, hm.Width, hm.Height);
-            }
-
-            ITerrainChannel hm = m_scene.Heightmap;
-
-            if (mapbmp.Width != hm.Width || mapbmp.Height != hm.Height)
-            {
-                m_log.ErrorFormat("{0} TerrainToBitmap. Passed bitmap wrong dimensions. passed=<{1},{2}>, size=<{3},{4}>",
                     "[TEXTURED MAP TILE RENDERER]", mapbmp.Width, mapbmp.Height, hm.Width, hm.Height);
             }