diff options
| author | Melanie | 2012-06-06 13:07:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 13:07:05 +0100 |
| commit | e733fb32cf76672cfddc25b3c9c02c50c025e2db (patch) | |
| tree | 1535c9e7d70cdb5f2e0779db8fc85fb98ede7ca5 /OpenSim/Region/OptionalModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Change log messages on Warp3DImageModule to show they are from this mo... (diff) | |
| download | opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.zip opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.gz opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.bz2 opensim-SC_OLD-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs index 48c242d..1aee39a 100644 --- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs +++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | |||
| @@ -113,14 +113,15 @@ namespace OpenSim.Region.OptionalModules.World.WorldView | |||
| 113 | if (!m_Enabled) | 113 | if (!m_Enabled) |
| 114 | return new Byte[0]; | 114 | return new Byte[0]; |
| 115 | 115 | ||
| 116 | Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, | 116 | using (Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, height, usetex)) |
| 117 | height, usetex); | 117 | { |
| 118 | 118 | using (MemoryStream str = new MemoryStream()) | |
| 119 | MemoryStream str = new MemoryStream(); | 119 | { |
| 120 | 120 | bmp.Save(str, ImageFormat.Jpeg); | |
| 121 | bmp.Save(str, ImageFormat.Jpeg); | ||
| 122 | 121 | ||
| 123 | return str.ToArray(); | 122 | return str.ToArray(); |
| 123 | } | ||
| 124 | } | ||
| 124 | } | 125 | } |
| 125 | } | 126 | } |
| 126 | } | 127 | } |