diff options
author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
---|---|---|
committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |
parent | bad merge? (diff) | |
download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz |
seems to compile ( tests comented out)
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 12 |
1 files changed, 0 insertions, 12 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 | |||
104 | 104 | ||
105 | terrainRenderer.Initialise(m_scene, m_config); | 105 | terrainRenderer.Initialise(m_scene, m_config); |
106 | 106 | ||
107 | <<<<<<< HEAD | ||
108 | mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, | 107 | mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, |
109 | System.Drawing.Imaging.PixelFormat.Format24bppRgb); | 108 | System.Drawing.Imaging.PixelFormat.Format24bppRgb); |
110 | //long t = System.Environment.TickCount; | 109 | //long t = System.Environment.TickCount; |
@@ -113,17 +112,6 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
113 | //} | 112 | //} |
114 | //t = System.Environment.TickCount - t; | 113 | //t = System.Environment.TickCount - t; |
115 | //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t); | 114 | //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t); |
116 | ======= | ||
117 | mapbmp = new Bitmap((int)m_scene.Heightmap.Width, (int)m_scene.Heightmap.Height, | ||
118 | System.Drawing.Imaging.PixelFormat.Format24bppRgb); | ||
119 | //long t = System.Environment.TickCount; | ||
120 | //for (int i = 0; i < 10; ++i) { | ||
121 | terrainRenderer.TerrainToBitmap(mapbmp); | ||
122 | //} | ||
123 | //t = System.Environment.TickCount - t; | ||
124 | //m_log.InfoFormat("[MAPTILE] generation of 10 maptiles needed {0} ms", t); | ||
125 | >>>>>>> avn/ubitvar | ||
126 | |||
127 | if (drawPrimVolume) | 115 | if (drawPrimVolume) |
128 | { | 116 | { |
129 | DrawObjectVolume(m_scene, mapbmp); | 117 | DrawObjectVolume(m_scene, mapbmp); |