diff options
author | Melanie | 2010-10-06 03:40:55 +0100 |
---|---|---|
committer | Melanie | 2010-10-06 03:40:55 +0100 |
commit | 752b6a876498a7a7b80e6892088d5015c340c13a (patch) | |
tree | 87c80d45551cb800816855f5aae4e088487d9df8 /OpenSim/Region | |
parent | Add the parameter plumbing and image generation (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | 8 |
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 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Drawing; | 30 | using System.Drawing; |
31 | using System.Drawing.Imaging; | ||
31 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.IO; | ||
32 | using log4net; | 34 | using log4net; |
33 | using Nini.Config; | 35 | using Nini.Config; |
34 | using OpenMetaverse; | 36 | using 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 | } |