diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 17066bd..f538c9e 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -125,10 +125,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
125 | 125 | ||
126 | public Bitmap CreateMapTile() | 126 | public Bitmap CreateMapTile() |
127 | { | 127 | { |
128 | /* this must be on all map, not just its image | ||
128 | if ((DateTime.Now - lastImageTime).TotalSeconds < 3600) | 129 | if ((DateTime.Now - lastImageTime).TotalSeconds < 3600) |
129 | { | 130 | { |
130 | return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat); | 131 | return (Bitmap)lastImage.Clone(); |
131 | } | 132 | } |
133 | */ | ||
132 | 134 | ||
133 | List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory()); | 135 | List<string> renderers = RenderingLoader.ListRenderers(Util.ExecutingDirectory()); |
134 | if (renderers.Count > 0) | 136 | if (renderers.Count > 0) |
@@ -147,10 +149,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
147 | 149 | ||
148 | Bitmap tile = CreateMapTile(viewport, false); | 150 | Bitmap tile = CreateMapTile(viewport, false); |
149 | m_primMesher = null; | 151 | m_primMesher = null; |
150 | 152 | return tile; | |
153 | /* | ||
151 | lastImage = tile; | 154 | lastImage = tile; |
152 | lastImageTime = DateTime.Now; | 155 | lastImageTime = DateTime.Now; |
153 | return lastImage.Clone(new Rectangle(0, 0, 256, 256), lastImage.PixelFormat); | 156 | return (Bitmap)lastImage.Clone(); |
157 | */ | ||
154 | } | 158 | } |
155 | 159 | ||
156 | public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures) | 160 | public Bitmap CreateViewImage(Vector3 camPos, Vector3 camDir, float fov, int width, int height, bool useTextures) |