aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2010-10-06 03:40:55 +0100
committerMelanie2010-10-06 03:40:55 +0100
commit752b6a876498a7a7b80e6892088d5015c340c13a (patch)
tree87c80d45551cb800816855f5aae4e088487d9df8 /OpenSim/Region/OptionalModules/World
parentAdd the parameter plumbing and image generation (diff)
downloadopensim-SC-752b6a876498a7a7b80e6892088d5015c340c13a.zip
opensim-SC-752b6a876498a7a7b80e6892088d5015c340c13a.tar.gz
opensim-SC-752b6a876498a7a7b80e6892088d5015c340c13a.tar.bz2
opensim-SC-752b6a876498a7a7b80e6892088d5015c340c13a.tar.xz
Convert the BMP to a JPEG image and return it. This should be testable.
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
index a2e47c3..bcf4187 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -28,7 +28,9 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Drawing; 30using System.Drawing;
31using System.Drawing.Imaging;
31using System.Reflection; 32using System.Reflection;
33using System.IO;
32using log4net; 34using log4net;
33using Nini.Config; 35using Nini.Config;
34using OpenMetaverse; 36using OpenMetaverse;
@@ -109,7 +111,11 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
109 Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, 111 Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width,
110 height); 112 height);
111 113
112 return new Byte[0]; 114 MemoryStream str = new MemoryStream();
115
116 bmp.Save(str, ImageFormat.Jpeg);
117
118 return str.ToArray();
113 } 119 }
114 } 120 }
115} 121}